Merge pull request #62 from novoda/fix_update_in_transaction

Fix update behaviour in content provider implementation

Author: joetimmins

core/src/androidTest/java/novoda/lib/sqliteprovider/ContentProviderTest.java

@@ -1,12 +1,22 @@
 
 package novoda.lib.sqliteprovider;
 
+import android.content.ContentValues;
 import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 import android.test.AndroidTestCase;
 
+import java.io.IOException;
+
+import novoda.lib.sqliteprovider.sqlite.ExtendedSQLiteOpenHelper;
+
 public class ContentProviderTest extends AndroidTestCase {
 
+    private static final String TABLE_NAME = "test";
+    private static final String COLUMN_PRIMARY_KEY = "column_primary_key";
+    private static final String ANY_COLUMN = "any_column";
+
     public ContentProviderTest() {
         super();
     }
@@ -18,4 +28,45 @@ public void testMapping() throws Exception {
         assertTrue(cursor.getColumnIndexOrThrow("childs__id") > -1);
         assertTrue(cursor.getColumnIndexOrThrow("parents_name") > -1);
     }
+
+    public void test_GivenATableWithData_When_UpdatingNonexistentRow_Then_NumberOfAffectedRowsShouldBeZero() throws Exception {
+        givenATableWithData();
+
+        ContentValues values = new ContentValues(1);
+        values.put(ANY_COLUMN, 1);
+
+        int numRows = new ExtendedSQLiteOpenHelper(getContext())
+                .getWritableDatabase()
+                .update(TABLE_NAME, values, COLUMN_PRIMARY_KEY + "=?", new String[]{"2"});
+
+        assertEquals(0, numRows);
+
+        numRows = getContext().getContentResolver().update(
+                Uri.parse("content://novoda.lib.sqliteprovider.test/" + TABLE_NAME),
+                values,
+                COLUMN_PRIMARY_KEY + "=?",
+                new String[]{"2"});
+
+        assertEquals(0, numRows);
+    }
+
+    private void givenATableWithData() throws IOException {
+        ExtendedSQLiteOpenHelper helper = new ExtendedSQLiteOpenHelper(getContext());
+        SQLiteDatabase db = helper.getWritableDatabase();
+        db.execSQL("CREATE TABLE IF NOT EXISTS `" + TABLE_NAME + "` (" +
+                           "`" + COLUMN_PRIMARY_KEY + "` INTEGER PRIMARY KEY," +
+                           "`" + ANY_COLUMN + "` INTEGER UNIQUE)");
+
+        ContentValues values = new ContentValues(2);
+        values.put(COLUMN_PRIMARY_KEY, 1);
+        values.put(ANY_COLUMN, 1);
+        helper.getWritableDatabase().insert(TABLE_NAME, null, values);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        ExtendedSQLiteOpenHelper helper = new ExtendedSQLiteOpenHelper(getContext());
+        SQLiteDatabase db = helper.getWritableDatabase();
+        db.execSQL("DROP TABLE IF EXISTS `" + TABLE_NAME + "`");
+    }
 }

core/src/androidTest/java/novoda/lib/sqliteprovider/sqlite/InsertHelperTest.java

@@ -143,7 +143,7 @@ private void onQueryOf(String tableName, CursorOperations cursorOperations) {
         }
     }
 
-    private static interface CursorOperations {
+    private interface CursorOperations {
         void doOperationsOn(Cursor cursor);
     }
 }

core/src/main/java/novoda/lib/sqliteprovider/provider/SQLiteContentProviderImpl.java

@@ -5,7 +5,6 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.database.DatabaseUtils;
-import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.net.Uri;
@@ -96,14 +95,12 @@ private Uri insertSilently(Uri uri, ContentValues values) {
     protected int updateInTransaction(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
         ContentValues insertValues = (values != null) ? new ContentValues(values) : new ContentValues();
 
-        int rowId = getWritableDatabase().update(UriUtils.getItemDirID(uri), insertValues, selection, selectionArgs);
+        int rowsAffected = getWritableDatabase().update(UriUtils.getItemDirID(uri), insertValues, selection, selectionArgs);
 
-        if (rowId > 0) {
-            Uri insertUri = ContentUris.withAppendedId(uri, rowId);
-            notifyUriChange(insertUri);
-            return rowId;
+        if (rowsAffected > 0) {
+            notifyUriChange(uri);
         }
-        throw new SQLException("Failed to update row into " + uri + " because it does not exists.");
+        return rowsAffected;
     }
 
     @Override