Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fc3144f authored by Steve Pomeroy's avatar Steve Pomeroy
Browse files

Fix documentation bug in SQLiteDatabase 

The documentation incorrectly states that, "[insertWithOnConflict
returns] the primary key of the existing row if the input param
'conflictAlgorithm' = CONFLICT_IGNORE". Unfortunately, SQLite does
not provide such functionality.

Close: https://code.google.com/p/android/issues/detail?id=13045



Change-Id: Ife919c4dcf7bf703b692d338d1fb5844a532dd39
Signed-off-by: default avatarSteve Pomeroy <steve@staticfree.info>
parent d58e7b2d

core/java/android/database/sqlite/SQLiteDatabase.java

+3 −4
Original line number Original line Diff line number Diff line
@@ -1429,10 +1429,9 @@ public final class SQLiteDatabase extends SQLiteClosable { 
     *            row. The keys should be the column names and the values the

     *            row. The keys should be the column names and the values the

     *            column values

     *            column values

     * @param conflictAlgorithm for insert conflict resolver

     * @param conflictAlgorithm for insert conflict resolver

     * @return the row ID of the newly inserted row

     * @return the row ID of the newly inserted row OR <code>-1</code> if either the

     * OR the primary key of the existing row if the input param 'conflictAlgorithm' =

     *            input parameter <code>conflictAlgorithm</code> = {@link #CONFLICT_IGNORE}

     * {@link #CONFLICT_IGNORE}

     *            or an error occurred.

     * OR -1 if any error

     */

     */

    public long insertWithOnConflict(String table, String nullColumnHack,

    public long insertWithOnConflict(String table, String nullColumnHack,

            ContentValues initialValues, int conflictAlgorithm) {

            ContentValues initialValues, int conflictAlgorithm) {