From bef4c2451ee731b572e95646f40e75a514baae9a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 18 Oct 2007 03:24:22 +0100 Subject: [PATCH] add option to auto-expand CDM list (bump schema) --- sanity_check.php | 2 +- schema/ttrss_schema_mysql.sql | 4 +++- schema/ttrss_schema_pgsql.sql | 4 +++- schema/versions/mysql/24.sql | 3 +++ schema/versions/pgsql/24.sql | 3 +++ 5 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 schema/versions/mysql/24.sql create mode 100644 schema/versions/pgsql/24.sql diff --git a/sanity_check.php b/sanity_check.php index 58baf7c30..21fc03806 100644 --- a/sanity_check.php +++ b/sanity_check.php @@ -2,7 +2,7 @@ require_once "functions.php"; define('EXPECTED_CONFIG_VERSION', 10); - define('SCHEMA_VERSION', 23); + define('SCHEMA_VERSION', 24); if (!file_exists("config.php")) { print __("Fatal Error: You forgot to copy diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index a340dbf25..181c49f4f 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -199,7 +199,7 @@ create table ttrss_tags (id integer primary key auto_increment, create table ttrss_version (schema_version int not null) TYPE=InnoDB; -insert into ttrss_version values (23); +insert into ttrss_version values (24); create table ttrss_prefs_types (id integer not null primary key, type_name varchar(100) not null) TYPE=InnoDB; @@ -301,6 +301,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('DIGEST_CATCHUP', 1, 'false', 'Mark articles in e-mail digest as read',1); +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CDM_EXPANDED', 1, 'true', 'Automatically expand articles in combined mode',3); + create table ttrss_user_prefs ( owner_uid integer not null, pref_name varchar(250), diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql index c7e0f8fbf..bb4c45375 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -178,7 +178,7 @@ create index ttrss_tags_owner_uid_index on ttrss_tags(owner_uid); create table ttrss_version (schema_version int not null); -insert into ttrss_version values (23); +insert into ttrss_version values (24); create table ttrss_prefs_types (id integer not null primary key, type_name varchar(100) not null); @@ -276,6 +276,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('DIGEST_CATCHUP', 1, 'false', 'Mark articles in e-mail digest as read',1); +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CDM_EXPANDED', 1, 'true', 'Automatically expand articles in combined mode',3); + create table ttrss_user_prefs ( owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE, pref_name varchar(250) not null references ttrss_prefs(pref_name) ON DELETE CASCADE, diff --git a/schema/versions/mysql/24.sql b/schema/versions/mysql/24.sql new file mode 100644 index 000000000..f24e34062 --- /dev/null +++ b/schema/versions/mysql/24.sql @@ -0,0 +1,3 @@ +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CDM_EXPANDED', 1, 'true', 'Automatically expand articles in combined mode',3); + +update ttrss_version set schema_version = 24; diff --git a/schema/versions/pgsql/24.sql b/schema/versions/pgsql/24.sql new file mode 100644 index 000000000..f24e34062 --- /dev/null +++ b/schema/versions/pgsql/24.sql @@ -0,0 +1,3 @@ +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CDM_EXPANDED', 1, 'true', 'Automatically expand articles in combined mode',3); + +update ttrss_version set schema_version = 24;