8 files changed, 92 insertions, 2 deletions
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index dce3921d5..76dabe95b 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -62,6 +62,7 @@ create table ttrss_feed_categories(id integer not null primary key auto_incremen
 	collapsed bool not null default false,
 	order_id integer not null default 0,
 	parent_cat integer,
+	view_settings varchar(250) not null default '',
 	index(parent_cat),
 	foreign key (parent_cat) references ttrss_feed_categories(id) ON DELETE SET NULL,
 	index(owner_uid),
@@ -127,6 +128,7 @@ create table ttrss_feeds (id integer not null auto_increment primary key,
 	mark_unread_on_update boolean not null default false,
 	update_on_checksum_change boolean not null default false,
 	strip_images boolean not null default false,
+	view_settings varchar(250) not null default '',
 	pubsub_state integer not null default 0,
 	favicon_last_checked datetime default null,
 	index(owner_uid),
@@ -246,11 +248,16 @@ insert into ttrss_filter_actions (id,name,description) values (6, 'score',
 insert into ttrss_filter_actions (id,name,description) values (7, 'label',
 	'Assign label');
 
+insert into ttrss_filter_actions (id,name,description) values (8, 'stop',
+	'Stop / Do nothing');
+
 create table ttrss_filters2(id integer primary key auto_increment,
 	owner_uid integer not null,
 	match_any_rule boolean not null default false,
 	enabled boolean not null default true,
 	inverse bool not null default false,
+	title varchar(250) not null default '',
+	order_id integer not null default 0,
 	index(owner_uid),
 	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
 
@@ -291,7 +298,7 @@ create table ttrss_tags (id integer primary key auto_increment,
 
 create table ttrss_version (schema_version int not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
 
-insert into ttrss_version values (111);
+insert into ttrss_version values (114);
 
 create table ttrss_enclosures (id integer primary key auto_increment,
 	content_url text not null,
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 8ef7f0805..2a171de4c 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -56,6 +56,7 @@ create table ttrss_feed_categories(id serial not null primary key,
 	owner_uid integer not null references ttrss_users(id) on delete cascade,
 	collapsed boolean not null default false,
 	order_id integer not null default 0,
+	view_settings varchar(250) not null default '',
 	parent_cat integer references ttrss_feed_categories(id) on delete set null,
 	title varchar(200) not null);
 
@@ -88,6 +89,7 @@ create table ttrss_feeds (id serial not null primary key,
 	mark_unread_on_update boolean not null default false,
 	update_on_checksum_change boolean not null default false,
 	strip_images boolean not null default false,
+	view_settings varchar(250) not null default '',
 	pubsub_state integer not null default 0,
 	favicon_last_checked timestamp default null,
 	auth_pass_encrypted boolean not null default false);
@@ -219,10 +221,15 @@ insert into ttrss_filter_actions (id,name,description) values (6, 'score',
 insert into ttrss_filter_actions (id,name,description) values (7, 'label',
 	'Assign label');
 
+insert into ttrss_filter_actions (id,name,description) values (8, 'stop',
+	'Stop / Do nothing');
+
 create table ttrss_filters2(id serial not null primary key,
 	owner_uid integer not null references ttrss_users(id) on delete cascade,
 	match_any_rule boolean not null default false,
 	inverse boolean not null default false,
+	title varchar(250) not null default '',
+	order_id integer not null default 0,
 	enabled boolean not null default true);
 
 create table ttrss_filters2_rules(id serial not null primary key,
@@ -249,7 +256,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 (111);
+insert into ttrss_version values (114);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
diff --git a/schema/versions/mysql/112.sql b/schema/versions/mysql/112.sql
new file mode 100644
index 000000000..a6f0b200b
--- /dev/null
+++ b/schema/versions/mysql/112.sql
@@ -0,0 +1,15 @@
+begin;
+
+alter table ttrss_filters2 add column order_id integer;
+update ttrss_filters2 set order_id = 0;
+alter table ttrss_filters2 change order_id order_id integer not null;
+alter table ttrss_filters2 alter column order_id set default 0;
+
+alter table ttrss_filters2 add column title varchar(250);
+update ttrss_filters2 set title = '';
+alter table ttrss_filters2 change title title varchar(250) not null;
+alter table ttrss_filters2 alter column title set default '';
+
+update ttrss_version set schema_version = 112;
+
+commit;
diff --git a/schema/versions/mysql/113.sql b/schema/versions/mysql/113.sql
new file mode 100644
index 000000000..3c0d00563
--- /dev/null
+++ b/schema/versions/mysql/113.sql
@@ -0,0 +1,8 @@
+begin;
+
+insert into ttrss_filter_actions (id,name,description) values (8, 'stop',
+	'Stop / Do nothing');
+
+update ttrss_version set schema_version = 113;
+
+commit;
diff --git a/schema/versions/mysql/114.sql b/schema/versions/mysql/114.sql
new file mode 100644
index 000000000..fd7ce5d2b
--- /dev/null
+++ b/schema/versions/mysql/114.sql
@@ -0,0 +1,15 @@
+begin;
+
+alter table ttrss_feeds add column view_settings varchar(250);
+update ttrss_feeds set view_settings = '';
+alter table ttrss_feeds change view_settings view_settings varchar(250) not null;
+alter table ttrss_feeds alter column view_settings set default '';
+
+alter table ttrss_feed_categories add column view_settings varchar(250);
+update ttrss_feed_categories set view_settings = '';
+alter table ttrss_feed_categories change view_settings view_settings varchar(250) not null;
+alter table ttrss_feed_categories alter column view_settings set default '';
+
+update ttrss_version set schema_version = 114;
+
+commit;
diff --git a/schema/versions/pgsql/112.sql b/schema/versions/pgsql/112.sql
new file mode 100644
index 000000000..a9d90d6d4
--- /dev/null
+++ b/schema/versions/pgsql/112.sql
@@ -0,0 +1,15 @@
+begin;
+
+alter table ttrss_filters2 add column order_id integer;
+update ttrss_filters2 set order_id = 0;
+alter table ttrss_filters2 alter column order_id set not null;
+alter table ttrss_filters2 alter column order_id set default 0;
+
+alter table ttrss_filters2 add column title varchar(250);
+update ttrss_filters2 set title = '';
+alter table ttrss_filters2 alter column title set not null;
+alter table ttrss_filters2 alter column title set default '';
+
+update ttrss_version set schema_version = 112;
+
+commit;
diff --git a/schema/versions/pgsql/113.sql b/schema/versions/pgsql/113.sql
new file mode 100644
index 000000000..3c0d00563
--- /dev/null
+++ b/schema/versions/pgsql/113.sql
@@ -0,0 +1,8 @@
+begin;
+
+insert into ttrss_filter_actions (id,name,description) values (8, 'stop',
+	'Stop / Do nothing');
+
+update ttrss_version set schema_version = 113;
+
+commit;
diff --git a/schema/versions/pgsql/114.sql b/schema/versions/pgsql/114.sql
new file mode 100644
index 000000000..d317ea794
--- /dev/null
+++ b/schema/versions/pgsql/114.sql
@@ -0,0 +1,15 @@
+begin;
+
+alter table ttrss_feeds add column view_settings varchar(250);
+update ttrss_feeds set view_settings = '';
+alter table ttrss_feeds alter column view_settings set not null;
+alter table ttrss_feeds alter column view_settings set default '';
+
+alter table ttrss_feed_categories add column view_settings varchar(250);
+update ttrss_feed_categories set view_settings = '';
+alter table ttrss_feed_categories alter column view_settings set not null;
+alter table ttrss_feed_categories alter column view_settings set default '';
+
+update ttrss_version set schema_version = 114;
+
+commit;