From 2f42315a13e37c772502e64dec7d3e2acfd968ab Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 6 Mar 2011 09:51:32 +0300 Subject: [PATCH] change description of CDM_AUTO_CATCHUP (bump schema) --- sanity_check.php | 2 +- schema/ttrss_schema_mysql.sql | 4 ++-- schema/ttrss_schema_pgsql.sql | 4 ++-- schema/versions/mysql/80.sql | 9 +++++++++ schema/versions/pgsql/80.sql | 9 +++++++++ 5 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 schema/versions/mysql/80.sql create mode 100644 schema/versions/pgsql/80.sql diff --git a/sanity_check.php b/sanity_check.php index ad93b0cc..83dacb15 100644 --- a/sanity_check.php +++ b/sanity_check.php @@ -2,7 +2,7 @@ require_once "functions.php"; define('EXPECTED_CONFIG_VERSION', 21); - define('SCHEMA_VERSION', 79); + define('SCHEMA_VERSION', 80); 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 c1d080e2..71798421 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -258,7 +258,7 @@ create table ttrss_tags (id integer primary key auto_increment, create table ttrss_version (schema_version int not null) TYPE=InnoDB DEFAULT CHARSET=UTF8; -insert into ttrss_version values (79); +insert into ttrss_version values (80); create table ttrss_enclosures (id integer primary key auto_increment, content_url text not null, @@ -335,7 +335,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CONFIRM_FEED_CATCHUP', 1, 'true', 'Confirm marking feed as read',3); -insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('CDM_AUTO_CATCHUP', 1, 'false', 'Mark articles as read automatically',2, 'This option enables marking articles as read automatically in combined mode (except for Fresh articles feed) while you scroll article list.'); +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('CDM_AUTO_CATCHUP', 1, 'false', 'Automatically mark articles as read',3, 'This option enables marking articles as read automatically while you scroll article list.'); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_DEFAULT_VIEW_MODE', 2, 'adaptive', '', 1); diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql index e0973bdc..cb0d39ea 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -229,7 +229,7 @@ create index ttrss_tags_post_int_id_idx on ttrss_tags(post_int_id); create table ttrss_version (schema_version int not null); -insert into ttrss_version values (79); +insert into ttrss_version values (80); create table ttrss_enclosures (id serial not null primary key, content_url text not null, @@ -299,7 +299,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CONFIRM_FEED_CATCHUP', 1, 'true', 'Confirm marking feed as read',3); -insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('CDM_AUTO_CATCHUP', 1, 'false', 'Mark articles as read automatically',2, 'This option enables marking articles as read automatically in combined mode (except for Fresh articles feed) while you scroll article list.'); +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('CDM_AUTO_CATCHUP', 1, 'false', 'Automatically mark articles as read',3, 'This option enables marking articles as read automatically while you scroll article list.'); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_DEFAULT_VIEW_MODE', 2, 'adaptive', '', 1); diff --git a/schema/versions/mysql/80.sql b/schema/versions/mysql/80.sql new file mode 100644 index 00000000..df2295c4 --- /dev/null +++ b/schema/versions/mysql/80.sql @@ -0,0 +1,9 @@ +begin; + +update ttrss_prefs set section_id = 3, + short_desc = 'Automatically mark articles as read', + help_text = 'Mark articles as read automatically while you scroll article list.' where pref_name = 'CDM_AUTO_CATCHUP'; + +update ttrss_version set schema_version = 80; + +commit; diff --git a/schema/versions/pgsql/80.sql b/schema/versions/pgsql/80.sql new file mode 100644 index 00000000..df2295c4 --- /dev/null +++ b/schema/versions/pgsql/80.sql @@ -0,0 +1,9 @@ +begin; + +update ttrss_prefs set section_id = 3, + short_desc = 'Automatically mark articles as read', + help_text = 'Mark articles as read automatically while you scroll article list.' where pref_name = 'CDM_AUTO_CATCHUP'; + +update ttrss_version set schema_version = 80; + +commit;