From 01b3e1919a5c99d21c0db8c13f1883320940c147 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 29 Mar 2006 04:11:48 +0100 Subject: split backend rpc, various interface improvements --- schema/ttrss_schema_mysql.sql | 5 ----- schema/ttrss_schema_pgsql.sql | 5 ----- schema/upgrade-1.1.4-1.1.5-mysql.sql | 8 ++++++++ schema/upgrade-1.1.4-1.1.5-pgsql.sql | 8 ++++++++ 4 files changed, 16 insertions(+), 10 deletions(-) (limited to 'schema') diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index cb616f333..8abc59b53 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -140,7 +140,6 @@ create table ttrss_filters (id integer not null primary key auto_increment, feed_id integer default null, filter_type integer not null, reg_exp varchar(250) not null, - description varchar(250) not null default '', action_id integer not null default 1, index (filter_type), foreign key (filter_type) references ttrss_filter_types(id) ON DELETE CASCADE, @@ -205,7 +204,6 @@ create table ttrss_prefs (pref_name varchar(250) not null primary key, insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_FEED_ICONS', 1, 'true', 'Enable icons in feedlist',2); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('PURGE_OLD_DAYS', 3, '60', 'Purge old posts after this number of days (0 - disables)',1); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('UPDATE_POST_ON_CHECKSUM_CHANGE', 1, 'true', 'Update post on checksum change',1); -insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_PREFS_CATCHUP_UNCATCHUP', 1, 'false', 'Enable catchup/uncatchup buttons in feed editor',2); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ENABLE_LABELS', 1, 'false', 'Enable labels',3, '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.'); @@ -216,9 +214,6 @@ 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,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).'); -insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('DISPLAY_FEEDLIST_ACTIONS', 1, 'false', 'Display feedlist actions',2, - 'Display separate dropbox for feedlist actions, if disabled these actions are available in global actions menu.'); - insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ALLOW_DUPLICATE_POSTS', 1, 'true', 'Allow duplicate posts',1, 'This option is useful when you are reading several planet-type aggregators with partially colliding userbase. When disabled, it forces same posts from different feeds to appear only once.'); diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql index c9dfe0205..c8020fd0a 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -134,7 +134,6 @@ create table ttrss_filters (id serial not null primary key, feed_id integer references ttrss_feeds(id) on delete cascade default null, filter_type integer not null references ttrss_filter_types(id), reg_exp varchar(250) not null, - description varchar(250) not null default '', action_id integer not null default 1 references ttrss_filter_actions(id) on delete cascade); create table ttrss_labels (id serial not null primary key, @@ -185,7 +184,6 @@ create table ttrss_prefs (pref_name varchar(250) not null primary key, insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_FEED_ICONS', 1, 'true', 'Enable icons in feedlist',2); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('PURGE_OLD_DAYS', 3, '60', 'Purge old posts after this number of days (0 - disables)',1); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('UPDATE_POST_ON_CHECKSUM_CHANGE', 1, 'true', 'Update post on checksum change',1); -insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_PREFS_CATCHUP_UNCATCHUP', 1, 'false', 'Enable catchup/uncatchup buttons in feed editor',2); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ENABLE_LABELS', 1, 'false', 'Enable labels',3, '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.'); @@ -195,9 +193,6 @@ 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('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).'); - -insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('DISPLAY_FEEDLIST_ACTIONS', 1, 'false', 'Display feedlist actions',2, - 'Display separate dropbox for feedlist actions, if disabled these actions are available in global actions menu.'); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ALLOW_DUPLICATE_POSTS', 1, 'true', 'Allow duplicate posts',1, 'This option is useful when you are reading several planet-type aggregators with partially colliding userbase. diff --git a/schema/upgrade-1.1.4-1.1.5-mysql.sql b/schema/upgrade-1.1.4-1.1.5-mysql.sql index 9fec820f6..bee135989 100644 --- a/schema/upgrade-1.1.4-1.1.5-mysql.sql +++ b/schema/upgrade-1.1.4-1.1.5-mysql.sql @@ -5,7 +5,15 @@ update ttrss_feeds set rtl_content = false; alter table ttrss_feeds change rtl_content rtl_content bool not null; alter table ttrss_feeds alter column rtl_content set default false; +delete from ttrss_user_prefs where pref_name = 'DISPLAY_FEEDLIST_ACTIONS'; +delete from ttrss_prefs where pref_name = 'DISPLAY_FEEDLIST_ACTIONS'; + +delete from ttrss_user_prefs where pref_name = 'ENABLE_PREFS_CATCHUP_UNCATCHUP'; +delete from ttrss_prefs where pref_name = 'ENABLE_PREFS_CATCHUP_UNCATCHUP'; + alter table ttrss_sessions drop column ip_address; +alter table ttrss_filters drop column description; + update ttrss_version set schema_version = 7; diff --git a/schema/upgrade-1.1.4-1.1.5-pgsql.sql b/schema/upgrade-1.1.4-1.1.5-pgsql.sql index 405daf620..51437e4fa 100644 --- a/schema/upgrade-1.1.4-1.1.5-pgsql.sql +++ b/schema/upgrade-1.1.4-1.1.5-pgsql.sql @@ -9,6 +9,14 @@ alter table ttrss_feeds alter column rtl_content set default false; alter table ttrss_sessions drop column ip_address; +delete from ttrss_user_prefs where pref_name = 'DISPLAY_FEEDLIST_ACTIONS'; +delete from ttrss_prefs where pref_name = 'DISPLAY_FEEDLIST_ACTIONS'; + +delete from ttrss_user_prefs where pref_name = 'ENABLE_PREFS_CATCHUP_UNCATCHUP'; +delete from ttrss_prefs where pref_name = 'ENABLE_PREFS_CATCHUP_UNCATCHUP'; + +alter table ttrss_filters drop column description; + update ttrss_version set schema_version = 7; commit; -- cgit v1.2.3