add interface/schema for inverse matching filters

6 files changed, 20 insertions, 2 deletions

diff --git a/schema/upgrade-1.2.4-1.2.6-mysql.sql b/schema/obsolete/upgrade-1.2.4-1.2.6-mysql.sql
index 73af4e375..73af4e375 100644
--- a/schema/upgrade-1.2.4-1.2.6-mysql.sql
+++ b/schema/obsolete/upgrade-1.2.4-1.2.6-mysql.sql
diff --git a/schema/upgrade-1.2.4-1.2.6-pgsql.sql b/schema/obsolete/upgrade-1.2.4-1.2.6-pgsql.sql
index 6de90f1ab..6de90f1ab 100644
--- a/schema/upgrade-1.2.4-1.2.6-pgsql.sql
+++ b/schema/obsolete/upgrade-1.2.4-1.2.6-pgsql.sql
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index e8c43dde6..2f9670225 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -154,6 +154,7 @@ 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,
+	inverse bool not null default false,
 	enabled bool not null default true,
 	action_id integer not null default 1,
 	action_param varchar(200) not null default '',
@@ -190,7 +191,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 (12);
+insert into ttrss_version values (13);
 
 create table ttrss_prefs_types (id integer not null primary key, 
 	type_name varchar(100) not null) TYPE=InnoDB;
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 3feacb75b..a9f056350 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -149,6 +149,7 @@ create table ttrss_filters (id serial not null primary key,
 	filter_type integer not null references ttrss_filter_types(id), 
 	reg_exp varchar(250) not null,
 	enabled boolean not null default true,
+	inverse boolean not null default false,
 	action_id integer not null default 1 references ttrss_filter_actions(id) on delete cascade,
 	action_param varchar(200) not null default '');
 
@@ -174,7 +175,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 (12);
+insert into ttrss_version values (13);
 
 create table ttrss_prefs_types (id integer not null primary key, 
 	type_name varchar(100) not null);
diff --git a/schema/upgrade-1.2.6-1.2.8-mysql.sql b/schema/upgrade-1.2.6-1.2.8-mysql.sql
new file mode 100644
index 000000000..ad068c8a2
--- /dev/null
+++ b/schema/upgrade-1.2.6-1.2.8-mysql.sql
@@ -0,0 +1,6 @@
+alter table ttrss_filters add column inverse bool;
+update ttrss_filters set inverse = false;
+alter table ttrss_filters change inverse inverse bool not null;
+alter table ttrss_filters alter column inverse set default false;
+
+update ttrss_version set schema_version = 13;
diff --git a/schema/upgrade-1.2.6-1.2.8-pgsql.sql b/schema/upgrade-1.2.6-1.2.8-pgsql.sql
new file mode 100644
index 000000000..bf2a2b438
--- /dev/null
+++ b/schema/upgrade-1.2.6-1.2.8-pgsql.sql
@@ -0,0 +1,10 @@
+begin;
+
+alter table ttrss_filters add column inverse boolean;
+update ttrss_filters set inverse = false;
+alter table ttrss_filters alter column inverse set not null;
+alter table ttrss_filters alter column inverse set default false;
+
+update ttrss_version set schema_version = 13;
+
+commit;