fix #573
This commit is contained in:
parent
6cbcef3ee5
commit
daa889ee95
|
@ -23,7 +23,7 @@ CREATE TABLE Categories (
|
||||||
title TEXT NOT NULL CHECK (title != ''),
|
title TEXT NOT NULL CHECK (title != ''),
|
||||||
description TEXT,
|
description TEXT,
|
||||||
date_created BIGINT,
|
date_created BIGINT,
|
||||||
icon °°,
|
icon ^^,
|
||||||
account_id INTEGER NOT NULL,
|
account_id INTEGER NOT NULL,
|
||||||
custom_id TEXT,
|
custom_id TEXT,
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ CREATE TABLE Feeds (
|
||||||
title TEXT NOT NULL CHECK (title != ''),
|
title TEXT NOT NULL CHECK (title != ''),
|
||||||
description TEXT,
|
description TEXT,
|
||||||
date_created BIGINT,
|
date_created BIGINT,
|
||||||
icon °°,
|
icon ^^,
|
||||||
category INTEGER NOT NULL CHECK (category >= -1), /* Physical category ID, also root feeds contain -1 here. */
|
category INTEGER NOT NULL CHECK (category >= -1), /* Physical category ID, also root feeds contain -1 here. */
|
||||||
source TEXT,
|
source TEXT,
|
||||||
update_type INTEGER NOT NULL CHECK (update_type >= 0),
|
update_type INTEGER NOT NULL CHECK (update_type >= 0),
|
||||||
|
|
|
@ -46,9 +46,9 @@ QStringList DatabaseDriver::prepareScript(const QString& base_sql_folder,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
statements.replaceInStrings(QSL(APP_DB_NAME_PLACEHOLDER), database_name);
|
statements = statements.replaceInStrings(QSL(APP_DB_NAME_PLACEHOLDER), database_name);
|
||||||
statements.replaceInStrings(QSL(APP_DB_AUTO_INC_PRIM_KEY_PLACEHOLDER), autoIncrementPrimaryKey());
|
statements = 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_BLOB_PLACEHOLDER), blob());
|
||||||
|
|
||||||
return statements;
|
return statements;
|
||||||
}
|
}
|
||||||
|
|
|
@ -183,7 +183,7 @@
|
||||||
#define APP_DB_INCLUDE_PLACEHOLDER "!!"
|
#define APP_DB_INCLUDE_PLACEHOLDER "!!"
|
||||||
#define APP_DB_NAME_PLACEHOLDER "##"
|
#define APP_DB_NAME_PLACEHOLDER "##"
|
||||||
#define APP_DB_AUTO_INC_PRIM_KEY_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_PATH "config"
|
||||||
#define APP_CFG_FILE "config.ini"
|
#define APP_CFG_FILE "config.ini"
|
||||||
|
|
Loading…
Reference in New Issue