Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev

This commit is contained in:
Mark Lu
2016-09-26 17:12:29 +00:00
committed by Android (Google) Code Review

View File

@@ -1371,6 +1371,7 @@ public final class SQLiteDatabase extends SQLiteClosable {
/** /**
* Convenience method for replacing a row in the database. * Convenience method for replacing a row in the database.
* Inserts a new row if a row does not already exist.
* *
* @param table the table in which to replace the row * @param table the table in which to replace the row
* @param nullColumnHack optional; may be <code>null</code>. * @param nullColumnHack optional; may be <code>null</code>.
@@ -1381,7 +1382,7 @@ public final class SQLiteDatabase extends SQLiteClosable {
* provides the name of nullable column name to explicitly insert a NULL into * provides the name of nullable column name to explicitly insert a NULL into
* in the case where your <code>initialValues</code> is empty. * in the case where your <code>initialValues</code> is empty.
* @param initialValues this map contains the initial column values for * @param initialValues this map contains the initial column values for
* the row. * the row. The keys should be the column names and the values the column values.
* @return the row ID of the newly inserted row, or -1 if an error occurred * @return the row ID of the newly inserted row, or -1 if an error occurred
*/ */
public long replace(String table, String nullColumnHack, ContentValues initialValues) { public long replace(String table, String nullColumnHack, ContentValues initialValues) {
@@ -1396,6 +1397,7 @@ public final class SQLiteDatabase extends SQLiteClosable {
/** /**
* Convenience method for replacing a row in the database. * Convenience method for replacing a row in the database.
* Inserts a new row if a row does not already exist.
* *
* @param table the table in which to replace the row * @param table the table in which to replace the row
* @param nullColumnHack optional; may be <code>null</code>. * @param nullColumnHack optional; may be <code>null</code>.
@@ -1406,7 +1408,7 @@ public final class SQLiteDatabase extends SQLiteClosable {
* provides the name of nullable column name to explicitly insert a NULL into * provides the name of nullable column name to explicitly insert a NULL into
* in the case where your <code>initialValues</code> is empty. * in the case where your <code>initialValues</code> is empty.
* @param initialValues this map contains the initial column values for * @param initialValues this map contains the initial column values for
* the row. The key * the row. The keys should be the column names and the values the column values.
* @throws SQLException * @throws SQLException
* @return the row ID of the newly inserted row, or -1 if an error occurred * @return the row ID of the newly inserted row, or -1 if an error occurred
*/ */