#831 Migrate from SQLiteOpenHelper to Room

Handle migration for Notes and Accounts

1 files changed, 3 insertions, 3 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DatabaseIndexUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DatabaseIndexUtil.java
index 624aa02e..665d540f 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DatabaseIndexUtil.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DatabaseIndexUtil.java
@@ -24,11 +24,11 @@ public class DatabaseIndexUtil {
     public static void createIndex(@NonNull SupportSQLiteDatabase db, @NonNull String table, @NonNull String column) {
         String indexName = table + "_" + column + "_idx";
         Log.v(TAG, "Creating database index: CREATE INDEX IF NOT EXISTS " + indexName + " ON " + table + "(" + column + ")");
-        db.execSQL("CREATE INDEX IF NOT EXISTS " + indexName + " ON " + table + "(" + column + ")");
+        db.execSQL("CREATE INDEX " + indexName + " ON " + table + "(" + column + ")");
     }
 
-    public static void dropIndexes(@NonNull SupportSQLiteDatabase db) {
-        try (Cursor c = db.query("SELECT name, sql FROM sqlite_master WHERE type = 'index'")) {
+    public static void dropIndexes(@NonNull SupportSQLiteDatabase db, String table) {
+        try (Cursor c = db.query("SELECT name, sql FROM sqlite_master WHERE type = 'index' AND name LIKE ?", new String[] {table + "_%"})) {
             while (c.moveToNext()) {
                 // Skip automatic indexes which we can't drop manually
                 if (c.getString(1) != null) {