diff --git a/resources/sql.qrc b/resources/sql.qrc index d15d562c4..77e8cb8db 100644 --- a/resources/sql.qrc +++ b/resources/sql.qrc @@ -6,6 +6,7 @@ sql/db_update_mysql_3_4.sql sql/db_update_mysql_4_5.sql sql/db_update_mysql_5_6.sql + sql/db_update_mysql_6_7.sql sql/db_init_sqlite.sql sql/db_update_sqlite_1_2.sql @@ -13,5 +14,6 @@ sql/db_update_sqlite_3_4.sql sql/db_update_sqlite_4_5.sql sql/db_update_sqlite_5_6.sql + sql/db_update_sqlite_6_7.sql \ No newline at end of file diff --git a/resources/sql/db_init_sqlite.sql b/resources/sql/db_init_sqlite.sql index 5dc63086a..120d40168 100644 --- a/resources/sql/db_init_sqlite.sql +++ b/resources/sql/db_init_sqlite.sql @@ -101,3 +101,13 @@ CREATE TABLE Labels ( FOREIGN KEY (account_id) REFERENCES Accounts (id) ON DELETE CASCADE ); +-- ! +CREATE TABLE Probes ( + id $$, + name TEXT NOT NULL CHECK (name != ''), + color VARCHAR(7) NOT NULL CHECK (color != ''), + fltr TEXT NOT NULL CHECK (filter != ''), /* Regular expression. */ + account_id INTEGER NOT NULL, + + FOREIGN KEY (account_id) REFERENCES Accounts (id) ON DELETE CASCADE +); \ No newline at end of file diff --git a/resources/sql/db_update_mysql_3_4.sql b/resources/sql/db_update_mysql_3_4.sql index d59935efe..18a6728c6 100644 --- a/resources/sql/db_update_mysql_3_4.sql +++ b/resources/sql/db_update_mysql_3_4.sql @@ -4,5 +4,4 @@ SET FOREIGN_KEY_CHECKS = 0; -- ! !! db_update_sqlite_3_4.sql -- ! -SET FOREIGN_KEY_CHECKS = 1; --- ! \ No newline at end of file +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/resources/sql/db_update_mysql_5_6.sql b/resources/sql/db_update_mysql_5_6.sql index 6dbe7a0ee..c7900b6e1 100755 --- a/resources/sql/db_update_mysql_5_6.sql +++ b/resources/sql/db_update_mysql_5_6.sql @@ -4,5 +4,4 @@ SET FOREIGN_KEY_CHECKS = 0; -- ! !! db_update_sqlite_5_6.sql -- ! -SET FOREIGN_KEY_CHECKS = 1; --- ! \ No newline at end of file +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/resources/sql/db_update_mysql_6_7.sql b/resources/sql/db_update_mysql_6_7.sql new file mode 100755 index 000000000..a5cf3d6bb --- /dev/null +++ b/resources/sql/db_update_mysql_6_7.sql @@ -0,0 +1,7 @@ +USE ##; +-- ! +SET FOREIGN_KEY_CHECKS = 0; +-- ! +!! db_update_sqlite_6_7.sql +-- ! +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/resources/sql/db_update_sqlite_6_7.sql b/resources/sql/db_update_sqlite_6_7.sql new file mode 100755 index 000000000..92d096c81 --- /dev/null +++ b/resources/sql/db_update_sqlite_6_7.sql @@ -0,0 +1,9 @@ +CREATE TABLE Probes ( + id $$, + name TEXT NOT NULL CHECK (name != ''), + color VARCHAR(7) NOT NULL CHECK (color != ''), + fltr TEXT NOT NULL CHECK (filter != ''), /* Regular expression. */ + account_id INTEGER NOT NULL, + + FOREIGN KEY (account_id) REFERENCES Accounts (id) ON DELETE CASCADE +); \ No newline at end of file diff --git a/src/librssguard/definitions/definitions.h b/src/librssguard/definitions/definitions.h index 0aa4b3c5c..38776018b 100644 --- a/src/librssguard/definitions/definitions.h +++ b/src/librssguard/definitions/definitions.h @@ -215,7 +215,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 "6" +#define APP_DB_SCHEMA_VERSION "7" #define APP_DB_UPDATE_FILE_PATTERN "db_update_%1_%2_%3.sql" #define APP_DB_COMMENT_SPLIT "-- !\n" #define APP_DB_INCLUDE_PLACEHOLDER "!!"