Revert "Database: future-proof to allow downgrade from future version"

This commit does not need to be in 2.6, it is only supposed to be in 2.5.1

This reverts commit a97f6fc.

Author: ogoffart

src/common/syncjournaldb.cpp

@@ -314,20 +314,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);
-        }
-    }
-
     pragma1.prepare("PRAGMA journal_mode=" + _journalMode + ";");
     if (!pragma1.exec()) {
         return sqlFail("Set PRAGMA journal_mode", pragma1);

src/gui/folder.cpp

@@ -1114,7 +1114,7 @@ void FolderDefinition::save(QSettings &settings, const FolderDefinition &folder)
     settings.setValue(QLatin1String("paused"), folder.paused);
     settings.setValue(QLatin1String("ignoreHiddenFiles"), folder.ignoreHiddenFiles);
     settings.setValue(QLatin1String("usePlaceholders"), folder.useVirtualFiles);
-    settings.setValue(QLatin1String(versionC), 1);
+    settings.setValue(QLatin1String(versionC), maxSettingsVersion());
 
     // Happens only on Windows when the explorer integration is enabled.
     if (!folder.navigationPaneClsid.isNull())

src/gui/folder.h

@@ -77,7 +77,7 @@ class FolderDefinition
         FolderDefinition *folder);
 
     /// The highest version in the settings that load() can read
-    static int maxSettingsVersion() { return 2; }
+    static int maxSettingsVersion() { return 1; }
 
     /// Ensure / as separator and trailing /.
     static QString prepareLocalPath(const QString &path);