From e52d6bc4bea996f257d0b50a4cdc56a9d48c67b8 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 May 2006 14:12:11 +0100 Subject: [PATCH] new option: ON_CATCHUP_SHOW_NEXT_FEED, fix several schema issues --- schema/ttrss_schema_mysql.sql | 7 ++++++- schema/ttrss_schema_pgsql.sql | 7 ++++++- schema/upgrade-1.1.5-1.1.7-mysql.sql | 3 +++ schema/upgrade-1.1.5-1.1.7-pgsql.sql | 6 ++++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 8abc59b53..d53eb60cd 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -24,6 +24,8 @@ create table ttrss_themes(id integer not null primary key auto_increment, theme_name varchar(200) not null, theme_path varchar(200) not null) TYPE=InnoDB; +insert into ttrss_themes (theme_name, theme_path) values ('Old-skool', 'compat'); + create table ttrss_users (id integer primary key not null auto_increment, login varchar(120) not null unique, pwd_hash varchar(250) not null, @@ -174,7 +176,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 (7); +insert into ttrss_version values (8); create table ttrss_prefs_types (id integer not null primary key, type_name varchar(100) not null) TYPE=InnoDB; @@ -239,6 +241,9 @@ 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('OPEN_LINKS_IN_NEW_WINDOW', 1, 'true', 'Open article links in new browser window',2); +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ON_CATCHUP_SHOW_NEXT_FEED', 1, 'false', 'On catchup show next feed',2, + 'When "Mark as read" button is clicked in toolbar, automatically open next feed with unread articles.'); + 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 c8020fd0a..b8c813c47 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -24,6 +24,8 @@ create table ttrss_themes(id serial not null primary key, theme_name varchar(200) not null, theme_path varchar(200) not null); +insert into ttrss_themes (theme_name, theme_path) values ('Old-skool', 'compat'); + create table ttrss_users (id serial not null primary key, login varchar(120) not null unique, pwd_hash varchar(250) not null, @@ -158,7 +160,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 (7); +insert into ttrss_version values (8); create table ttrss_prefs_types (id integer not null primary key, type_name varchar(100) not null); @@ -219,6 +221,9 @@ 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('OPEN_LINKS_IN_NEW_WINDOW', 1, 'true', 'Open article links in new browser window',2); +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ON_CATCHUP_SHOW_NEXT_FEED', 1, 'false', 'On catchup show next feed',2, + 'When "Mark as read" button is clicked in toolbar, automatically open next feed with unread articles.'); + 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/upgrade-1.1.5-1.1.7-mysql.sql b/schema/upgrade-1.1.5-1.1.7-mysql.sql index 53d7cc7f5..aa74eb343 100644 --- a/schema/upgrade-1.1.5-1.1.7-mysql.sql +++ b/schema/upgrade-1.1.5-1.1.7-mysql.sql @@ -1,4 +1,7 @@ insert into ttrss_themes (theme_name, theme_path) values ('Old-skool', 'compat'); +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ON_CATCHUP_SHOW_NEXT_FEED', 1, 'false', 'On catchup show next feed',2, + 'When "Mark as read" button is clicked in toolbar, automatically open next feed with unread articles.'); + update ttrss_version set schema_version = 8; diff --git a/schema/upgrade-1.1.5-1.1.7-pgsql.sql b/schema/upgrade-1.1.5-1.1.7-pgsql.sql index 53d7cc7f5..88b1ecf35 100644 --- a/schema/upgrade-1.1.5-1.1.7-pgsql.sql +++ b/schema/upgrade-1.1.5-1.1.7-pgsql.sql @@ -1,4 +1,10 @@ +begin; + insert into ttrss_themes (theme_name, theme_path) values ('Old-skool', 'compat'); +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ON_CATCHUP_SHOW_NEXT_FEED', 1, 'false', 'On catchup show next feed',2, + 'When "Mark as read" button is clicked in toolbar, automatically open next feed with unread articles.'); + update ttrss_version set schema_version = 8; +commit;