FreshRSS
/
rssguard
mirror of https://github.com/martinrotter/rssguard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #573

This commit is contained in:
Martin Rotter 2022-01-09 08:51:58 +01:00
parent 6cbcef3ee5
commit daa889ee95
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/sql/db_init_sqlite.sql
View File

@ -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),

6
src/librssguard/database/databasedriver.cpp
View File

@ -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;
}

2
src/librssguard/definitions/definitions.h
View File

@ -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"