new option: ON_CATCHUP_SHOW_NEXT_FEED, fix several schema issues

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 8abc59b53f0c35c3ab5b73aeb5e8198fce996698..d53eb60cdee8720cc9b2c58cad3f7c6921e285df 100644 (file)
--- 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 c8020fd0adfc6add44f2ba2476d45560099c75e6..b8c813c4762c4b397bc8982069f23e7f5fd3708e 100644 (file)
--- 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 53d7cc7f50e69a6dd99490435868043875302839..aa74eb34357b84abcea3c05104636c0ae5add156 100644 (file)
--- 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 53d7cc7f50e69a6dd99490435868043875302839..88b1ecf358c7b789e07d0a8301fb0dd10e5b0fe3 100644 (file)
--- 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;