From daa889ee951dea1e2827d8f61cc4db626de854e2 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Sun, 9 Jan 2022 08:51:58 +0100 Subject: [PATCH] fix #573 --- resources/sql/db_init_sqlite.sql | 4 ++-- src/librssguard/database/databasedriver.cpp | 6 +++--- src/librssguard/definitions/definitions.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/sql/db_init_sqlite.sql b/resources/sql/db_init_sqlite.sql index 34eebd655..8fca6d468 100644 --- a/resources/sql/db_init_sqlite.sql +++ b/resources/sql/db_init_sqlite.sql @@ -23,7 +23,7 @@ CREATE TABLE Categories ( title TEXT NOT NULL CHECK (title != ''), description TEXT, date_created BIGINT, - icon °°, + icon ^^, account_id INTEGER NOT NULL, custom_id TEXT, @@ -35,7 +35,7 @@ CREATE TABLE Feeds ( title TEXT NOT NULL CHECK (title != ''), description TEXT, date_created BIGINT, - icon °°, + icon ^^, category INTEGER NOT NULL CHECK (category >= -1), /* Physical category ID, also root feeds contain -1 here. */ source TEXT, update_type INTEGER NOT NULL CHECK (update_type >= 0), diff --git a/src/librssguard/database/databasedriver.cpp b/src/librssguard/database/databasedriver.cpp index 06a792270..034cdbc8a 100644 --- a/src/librssguard/database/databasedriver.cpp +++ b/src/librssguard/database/databasedriver.cpp @@ -46,9 +46,9 @@ QStringList DatabaseDriver::prepareScript(const QString& base_sql_folder, } } - statements.replaceInStrings(QSL(APP_DB_NAME_PLACEHOLDER), database_name); - statements.replaceInStrings(QSL(APP_DB_AUTO_INC_PRIM_KEY_PLACEHOLDER), autoIncrementPrimaryKey()); - statements.replaceInStrings(QSL(APP_DB_BLOB_PLACEHOLDER), blob()); + statements = statements.replaceInStrings(QSL(APP_DB_NAME_PLACEHOLDER), database_name); + statements = statements.replaceInStrings(QSL(APP_DB_AUTO_INC_PRIM_KEY_PLACEHOLDER), autoIncrementPrimaryKey()); + statements = statements.replaceInStrings(QSL(APP_DB_BLOB_PLACEHOLDER), blob()); return statements; } diff --git a/src/librssguard/definitions/definitions.h b/src/librssguard/definitions/definitions.h index f786f5cd1..0bf4c0451 100644 --- a/src/librssguard/definitions/definitions.h +++ b/src/librssguard/definitions/definitions.h @@ -183,7 +183,7 @@ #define APP_DB_INCLUDE_PLACEHOLDER "!!" #define APP_DB_NAME_PLACEHOLDER "##" #define APP_DB_AUTO_INC_PRIM_KEY_PLACEHOLDER "$$" -#define APP_DB_BLOB_PLACEHOLDER "°°" +#define APP_DB_BLOB_PLACEHOLDER "^^" #define APP_CFG_PATH "config" #define APP_CFG_FILE "config.ini"