schema: add enabled field to ttrss_filters

4 files changed, 12 insertions, 0 deletions

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 74ad87cfe..b6bf13426 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -148,6 +148,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,
+	enabled bool not null default true,
 	action_id integer not null default 1,
 	index (filter_type),
 	foreign key (filter_type) references ttrss_filter_types(id) ON DELETE CASCADE,
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 3e7ce8b53..81c865af9 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -142,6 +142,7 @@ 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,
+	enabled boolean not null default true,
 	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, 
diff --git a/schema/upgrade-1.1.7-1.2.2-mysql.sql b/schema/upgrade-1.1.7-1.2.2-mysql.sql
index a82a06269..546adc2d7 100644
--- a/schema/upgrade-1.1.7-1.2.2-mysql.sql
+++ b/schema/upgrade-1.1.7-1.2.2-mysql.sql
@@ -12,6 +12,11 @@ alter table ttrss_users add column last_digest_sent datetime;
 update ttrss_users set last_digest_sent = false;
 alter table ttrss_users alter column last_digest_sent set default null;
 
+alter table ttrss_filters add column enabled bool;
+update ttrss_filters set enabled = true;
+alter table ttrss_filters change enabled enabled bool not null;
+alter table ttrss_filters alter column enabled set default true;
+
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('MARK_UNREAD_ON_UPDATE', 1, 'false', 'Set articles as unread on update',3);
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('REVERSE_HEADLINES', 1, 'false', 'Reverse headline order (oldest first)',2);
diff --git a/schema/upgrade-1.1.7-1.2.2-pgsql.sql b/schema/upgrade-1.1.7-1.2.2-pgsql.sql
index b47d89bc6..9624403aa 100644
--- a/schema/upgrade-1.1.7-1.2.2-pgsql.sql
+++ b/schema/upgrade-1.1.7-1.2.2-pgsql.sql
@@ -14,6 +14,11 @@ alter table ttrss_users add column last_digest_sent timestamp;
 update ttrss_users set last_digest_sent = NULL;
 alter table ttrss_users alter column last_digest_sent set default NULL;
 
+alter table ttrss_filters add column enabled boolean;
+update ttrss_filters set enabled = true;
+alter table ttrss_filters alter column enabled set not null;
+alter table ttrss_filters alter column enabled set default true;
+
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('MARK_UNREAD_ON_UPDATE', 1, 'false', 'Set articles as unread on update',3);
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('REVERSE_HEADLINES', 1, 'false', 'Reverse headline order (oldest first)',2);