Db: Move drop-index to after pragmas are set #6881

Author: ckamm

src/common/syncjournaldb.cpp

@@ -313,20 +313,6 @@ bool SyncJournalDb::checkConnect()
         qCInfo(lcDb) << "sqlite3 version" << pragma1.stringValue(0);
     }
 
-    {
-        // Future version of the client (2.6) will have an index 'metadata_parent' which
-        // depends on a custom sqlite function which does not exist yet in 2.5.
-        // So make sure to remove the index if it exists, otherwise we will crash when inserting
-        // rows in the metadata database.
-        // This needs to be done before the synchronous mode is enabled.
-        // The 2.6 client will anyway re-creates this index if it does not exist.
-        SqlQuery query(_db);
-        query.prepare("DROP INDEX IF EXISTS metadata_parent;");
-        if (!query.exec()) {
-            return sqlFail("updateMetadataTableStructure: remove index metadata_parent", query);
-        }
-    }
-
     // Set locking mode to avoid issues with WAL on Windows
     static QByteArray locking_mode_env = qgetenv("OWNCLOUD_SQLITE_LOCKING_MODE");
     if (locking_mode_env.isEmpty())
@@ -366,6 +352,19 @@ bool SyncJournalDb::checkConnect()
         return sqlFail("Set PRAGMA case_sensitivity", pragma1);
     }
 
+    {
+        // Future version of the client (2.6) will have an index 'metadata_parent' which
+        // depends on a custom sqlite function which does not exist yet in 2.5.
+        // So make sure to remove the index if it exists, otherwise we will crash when inserting
+        // rows in the metadata database.
+        // The 2.6 client will anyway re-creates this index if it does not exist.
+        SqlQuery query(_db);
+        query.prepare("DROP INDEX IF EXISTS metadata_parent;");
+        if (!query.exec()) {
+            return sqlFail("updateMetadataTableStructure: remove index metadata_parent", query);
+        }
+    }
+
     /* Because insert is so slow, we do everything in a transaction, and only need one call to commit */
     startTransaction();