Merge "Call getWrappedDb in DatabaseErrorHandler."

aosp-mirror · Jul 18, 2018 · ea1f61a · ea1f61a
2 parents c6c2ede + e8dbe09
commit ea1f61a
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 10 deletions.
diff --git a/...ce/db-framework/src/main/java/androidx/sqlite/db/framework/FrameworkSQLiteOpenHelper.java b/...ce/db-framework/src/main/java/androidx/sqlite/db/framework/FrameworkSQLiteOpenHelper.java
@@ -80,10 +80,7 @@ static class OpenHelper extends SQLiteOpenHelper {
                     new DatabaseErrorHandler() {
                         @Override
                         public void onCorruption(SQLiteDatabase dbObj) {
-                            FrameworkSQLiteDatabase db = dbRef[0];
-                            if (db != null) {
-                                callback.onCorruption(db);
-                            }
+                            callback.onCorruption(getWrappedDb(dbRef, dbObj));
                         }
                     });
             mCallback = callback;
@@ -113,12 +110,7 @@ synchronized SupportSQLiteDatabase getReadableSupportDatabase() {
         }
 
         FrameworkSQLiteDatabase getWrappedDb(SQLiteDatabase sqLiteDatabase) {
-            FrameworkSQLiteDatabase dbRef = mDbRef[0];
-            if (dbRef == null || !dbRef.isDelegate(sqLiteDatabase)) {
-                dbRef = new FrameworkSQLiteDatabase(sqLiteDatabase);
-                mDbRef[0] = dbRef;
-            }
-            return mDbRef[0];
+            return getWrappedDb(mDbRef, sqLiteDatabase);
         }
 
         @Override
@@ -156,5 +148,14 @@ public synchronized void close() {
             super.close();
             mDbRef[0] = null;
         }
+
+        static FrameworkSQLiteDatabase getWrappedDb(FrameworkSQLiteDatabase[] refHolder,
+                SQLiteDatabase sqLiteDatabase) {
+            FrameworkSQLiteDatabase dbRef = refHolder[0];
+            if (dbRef == null || !dbRef.isDelegate(sqLiteDatabase)) {
+                refHolder[0] = new FrameworkSQLiteDatabase(sqLiteDatabase);
+            }
+            return refHolder[0];
+        }
     }
 }
diff --git a/...app/src/androidTest/java/androidx/room/integration/testapp/test/DatabaseCallbackTest.java b/...app/src/androidTest/java/androidx/room/integration/testapp/test/DatabaseCallbackTest.java
@@ -43,6 +43,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -148,6 +151,38 @@ public void onCreate(@NonNull SupportSQLiteDatabase db) {
         assertThat(ids, is(empty()));
     }
 
+    @Test
+    @MediumTest
+    public void corruptExceptionOnCreate() throws IOException {
+        Context context = InstrumentationRegistry.getTargetContext();
+
+        TestDatabaseCallback callback = new TestDatabaseCallback();
+
+        // Create fake DB files that will cause a SQLiteDatabaseCorruptException: SQLITE_NOTADB.
+        String[] dbFiles = new String[] {"corrupted", "corrupted-shm", "corrupted-wal"};
+        for (String fileName : dbFiles) {
+            File dbFile = context.getDatabasePath(fileName);
+            try (FileWriter fileWriter = new FileWriter(dbFile)) {
+                fileWriter.write(new char[]{'p', 'o', 'i', 's', 'o', 'n'});
+            }
+        }
+
+        TestDatabase db = Room.databaseBuilder(context, TestDatabase.class, "corrupted")
+                .addCallback(callback)
+                .build();
+
+        assertFalse(callback.mCreated);
+        assertFalse(callback.mOpened);
+
+        // Should not throw a SQLiteDatabaseCorruptException, i.e. default onCorruption() was
+        // executed and DB file was re-created.
+        List<Integer> ids = db.getUserDao().loadIds();
+        assertThat(ids, is(empty()));
+
+        assertTrue(callback.mCreated);
+        assertTrue(callback.mOpened);
+    }
+
     public static class TestDatabaseCallback extends RoomDatabase.Callback {
 
         boolean mCreated;