From 96527ac6594b82c09b8df21830673996a1027266 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 29 Sep 2006 08:53:47 +0100 Subject: [PATCH] remove DISPLAY_HEADER/FOOTER options (update schema) --- schema/ttrss_schema_mysql.sql | 4 +--- schema/ttrss_schema_pgsql.sql | 4 +--- schema/upgrade-1.2.3-1.2.4-mysql.sql | 11 +++++++++++ schema/upgrade-1.2.3-1.2.4-pgsql.sql | 11 +++++++++++ 4 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 schema/upgrade-1.2.3-1.2.4-mysql.sql create mode 100644 schema/upgrade-1.2.3-1.2.4-pgsql.sql diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 50c3013f..68c081cb 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -184,7 +184,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 (10); +insert into ttrss_version values (11); create table ttrss_prefs_types (id integer not null primary key, type_name varchar(100) not null) TYPE=InnoDB; @@ -218,8 +218,6 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_ 'Experimental support for virtual feeds based on user crafted SQL queries. This feature is highly experimental and at this point not user friendly. Use with caution.'); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('DEFAULT_UPDATE_INTERVAL', 3, '30', 'Default interval between feed updates (in minutes)',1); -insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('DISPLAY_HEADER', 1, 'true', 'Display header',2); -insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('DISPLAY_FOOTER', 1, 'true', 'Display footer',2); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('USE_COMPACT_STYLESHEET', 1, 'false', 'Use compact stylesheet by default',2); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('DEFAULT_ARTICLE_LIMIT', 3, '0', 'Default article limit',2, 'Default limit for articles to display, any custom number you like (0 - disables).'); diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql index 9b4988bb..c9fb739e 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -168,7 +168,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 (10); +insert into ttrss_version values (11); create table ttrss_prefs_types (id integer not null primary key, type_name varchar(100) not null); @@ -198,8 +198,6 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_ 'Experimental support for virtual feeds based on user crafted SQL queries. This feature is highly experimental and at this point not user friendly. Use with caution.'); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('DEFAULT_UPDATE_INTERVAL', 3, '30', 'Default interval between feed updates (in minutes)',1); -insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('DISPLAY_HEADER', 1, 'true', 'Display header',2); -insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('DISPLAY_FOOTER', 1, 'true', 'Display footer',2); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('USE_COMPACT_STYLESHEET', 1, 'false', 'Use compact stylesheet by default',2); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('DEFAULT_ARTICLE_LIMIT', 3, '0', 'Default article limit',2, 'Default limit for articles to display, any custom number you like (0 - disables).'); diff --git a/schema/upgrade-1.2.3-1.2.4-mysql.sql b/schema/upgrade-1.2.3-1.2.4-mysql.sql new file mode 100644 index 00000000..43ae8600 --- /dev/null +++ b/schema/upgrade-1.2.3-1.2.4-mysql.sql @@ -0,0 +1,11 @@ +begin; + +delete FROM ttrss_user_prefs WHERE pref_name = 'DISPLAY_HEADER'; +delete FROM ttrss_user_prefs WHERE pref_name = 'DISPLAY_FOOTER'; + +delete FROM ttrss_prefs WHERE pref_name = 'DISPLAY_HEADER'; +delete FROM ttrss_prefs WHERE pref_name = 'DISPLAY_FOOTER'; + +update ttrss_version set schema_version = 11; + +commit; diff --git a/schema/upgrade-1.2.3-1.2.4-pgsql.sql b/schema/upgrade-1.2.3-1.2.4-pgsql.sql new file mode 100644 index 00000000..43ae8600 --- /dev/null +++ b/schema/upgrade-1.2.3-1.2.4-pgsql.sql @@ -0,0 +1,11 @@ +begin; + +delete FROM ttrss_user_prefs WHERE pref_name = 'DISPLAY_HEADER'; +delete FROM ttrss_user_prefs WHERE pref_name = 'DISPLAY_FOOTER'; + +delete FROM ttrss_prefs WHERE pref_name = 'DISPLAY_HEADER'; +delete FROM ttrss_prefs WHERE pref_name = 'DISPLAY_FOOTER'; + +update ttrss_version set schema_version = 11; + +commit;