diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml index 4279baeb1..3f524a6db 100644 --- a/resources/desktop/com.github.rssguard.appdata.xml +++ b/resources/desktop/com.github.rssguard.appdata.xml @@ -30,7 +30,7 @@ https://martinrotter.github.io/donate/ - + none diff --git a/resources/sql.qrc b/resources/sql.qrc index 377b29753..959541956 100755 --- a/resources/sql.qrc +++ b/resources/sql.qrc @@ -18,6 +18,7 @@ sql/db_update_mysql_15_16.sql sql/db_update_mysql_16_17.sql sql/db_update_mysql_17_18.sql + sql/db_update_mysql_18_19.sql sql/db_init_sqlite.sql sql/db_update_sqlite_1_2.sql @@ -37,5 +38,6 @@ sql/db_update_sqlite_15_16.sql sql/db_update_sqlite_16_17.sql sql/db_update_sqlite_17_18.sql + sql/db_update_sqlite_18_19.sql \ No newline at end of file diff --git a/resources/sql/db_init_mysql.sql b/resources/sql/db_init_mysql.sql index 59453e25c..2413eb309 100644 --- a/resources/sql/db_init_mysql.sql +++ b/resources/sql/db_init_mysql.sql @@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS Information ( inf_value TEXT NOT NULL ); -- ! -INSERT INTO Information VALUES (1, 'schema_version', '18'); +INSERT INTO Information VALUES (1, 'schema_version', '19'); -- ! CREATE TABLE IF NOT EXISTS Accounts ( id INTEGER AUTO_INCREMENT PRIMARY KEY, @@ -74,6 +74,17 @@ CREATE TABLE IF NOT EXISTS GmailAccounts ( FOREIGN KEY (id) REFERENCES Accounts (id) ); -- ! +CREATE TABLE IF NOT EXISTS GoogleReaderApiAccounts ( + id INTEGER, + type INTEGER NOT NULL CHECK (type >= 1), + username TEXT NOT NULL, + password TEXT, + url TEXT NOT NULL, + msg_limit INTEGER NOT NULL DEFAULT -1 CHECK (msg_limit >= -1), + + FOREIGN KEY (id) REFERENCES Accounts (id) +); +-- ! DROP TABLE IF EXISTS Categories; -- ! CREATE TABLE IF NOT EXISTS Categories ( diff --git a/resources/sql/db_init_sqlite.sql b/resources/sql/db_init_sqlite.sql index a2da66f58..a024aba25 100644 --- a/resources/sql/db_init_sqlite.sql +++ b/resources/sql/db_init_sqlite.sql @@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS Information ( inf_value TEXT NOT NULL ); -- ! -INSERT INTO Information VALUES (1, 'schema_version', '18'); +INSERT INTO Information VALUES (1, 'schema_version', '19'); -- ! CREATE TABLE IF NOT EXISTS Accounts ( id INTEGER PRIMARY KEY, @@ -68,6 +68,17 @@ CREATE TABLE IF NOT EXISTS GmailAccounts ( FOREIGN KEY (id) REFERENCES Accounts (id) ); -- ! +CREATE TABLE IF NOT EXISTS GoogleReaderApiAccounts ( + id INTEGER, + type INTEGER NOT NULL CHECK (type >= 1), + username TEXT NOT NULL, + password TEXT, + url TEXT NOT NULL, + msg_limit INTEGER NOT NULL DEFAULT -1 CHECK (msg_limit >= -1), + + FOREIGN KEY (id) REFERENCES Accounts (id) +); +-- ! DROP TABLE IF EXISTS Categories; -- ! CREATE TABLE IF NOT EXISTS Categories ( diff --git a/src/librssguard/definitions/definitions.h b/src/librssguard/definitions/definitions.h index 4b23c3604..d00b6c590 100755 --- a/src/librssguard/definitions/definitions.h +++ b/src/librssguard/definitions/definitions.h @@ -144,7 +144,7 @@ #define APP_DB_SQLITE_FILE "database.db" // Keep this in sync with schema versions declared in SQL initialization code. -#define APP_DB_SCHEMA_VERSION "18" +#define APP_DB_SCHEMA_VERSION "19" #define APP_DB_UPDATE_FILE_PATTERN "db_update_%1_%2_%3.sql" #define APP_DB_COMMENT_SPLIT "-- !\n" #define APP_DB_NAME_PLACEHOLDER "##"