From b7de5d6df31e70fd1070f5aa09c248f2a32a0435 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Thu, 8 Apr 2021 22:12:14 +0200 Subject: [PATCH] Only enable FTS3 when schema needs upgrading --- src/core/database.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/database.cpp b/src/core/database.cpp index 268072513..5345af4a8 100644 --- a/src/core/database.cpp +++ b/src/core/database.cpp @@ -151,7 +151,7 @@ QSqlDatabase Database::Connect() { UpdateDatabaseSchema(0, db); } - { + if (SchemaVersion(&db) < 10) { // Register unicode from unicode61 tokenizer to drop old FTS3 tables. // We need it also to drop old devices later when loading devices. // And that's done in a different thread after schemas are upgraded, so register it anyway. @@ -160,7 +160,7 @@ QSqlDatabase Database::Connect() { if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) { sqlite3 *handle = *static_cast(v.data()); if (handle) { - int result = sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL); + int result = sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, nullptr); if (result != SQLITE_OK) qLog(Fatal) << "Unable to enable FTS3 tokenizer"; } else qLog(Fatal) << "Unable to enable FTS3 tokenizer";