drop ttrss_filters from the schema

include/labels.php

@@ -163,13 +163,6 @@
 			db_query($link, "DELETE FROM ttrss_access_keys WHERE
 				feed_id = '$ext_id' AND owner_uid = $owner_uid");
 
-			/* Disable filters that reference label being removed */
-
-			db_query($link, "UPDATE ttrss_filters SET
-				enabled = false WHERE action_param = '$caption'
-					AND action_id = 7
-					AND owner_uid = " . $owner_uid);
-
 			/* Remove cached data */
 
 			db_query($link, "UPDATE ttrss_user_entries SET label_cache = ''

schema/ttrss_schema_mysql.sql

@@ -13,7 +13,6 @@ drop table if exists ttrss_labels;
 drop table if exists ttrss_filters2_actions;
 drop table if exists ttrss_filters2_rules;
 drop table if exists ttrss_filters2;
-drop table if exists ttrss_filters;
 drop table if exists ttrss_filter_types;
 drop table if exists ttrss_filter_actions;
 drop table if exists ttrss_user_prefs;
@@ -247,29 +246,6 @@ insert into ttrss_filter_actions (id,name,description) values (6, 'score',
 insert into ttrss_filter_actions (id,name,description) values (7, 'label',
 	'Assign label');
 
-create table ttrss_filters (id integer not null primary key auto_increment,
-	owner_uid integer not null,
-	feed_id integer default null,
-	filter_type integer not null,
-	reg_exp varchar(250) not null,
-	filter_param varchar(250) not null default '',
-	inverse bool not null default false,
-	enabled bool not null default true,
-	cat_filter bool not null default false,
-	cat_id integer default null,
-	action_id integer not null default 1,
-	action_param varchar(250) not null default '',
-	index (filter_type),
-	foreign key (filter_type) references ttrss_filter_types(id) ON DELETE CASCADE,
-	index (owner_uid),
-	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE,
-	index (feed_id),
-	foreign key (feed_id) references ttrss_feeds(id) ON DELETE CASCADE,
-	index (cat_id),
-	foreign key (cat_id) references ttrss_feed_categories(id) ON DELETE CASCADE,
-	index (action_id),
-	foreign key (action_id) references ttrss_filter_actions(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
-
 create table ttrss_filters2(id integer primary key auto_increment,
 	owner_uid integer not null,
 	match_any_rule boolean not null default false,

schema/ttrss_schema_pgsql.sql

@@ -10,7 +10,6 @@ drop table if exists ttrss_labels;
 drop table if exists ttrss_filters2_rules;
 drop table if exists ttrss_filters2_actions;
 drop table if exists ttrss_filters2;
-drop table if exists ttrss_filters;
 drop table if exists ttrss_filter_types;
 drop table if exists ttrss_filter_actions;
 drop table if exists ttrss_user_prefs;
@@ -220,19 +219,6 @@ insert into ttrss_filter_actions (id,name,description) values (6, 'score',
 insert into ttrss_filter_actions (id,name,description) values (7, 'label',
 	'Assign label');
 
-create table ttrss_filters (id serial not null primary key,
-	owner_uid integer not null references ttrss_users(id) on delete cascade,
-	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,
-	filter_param varchar(250) not null default '',
-	enabled boolean not null default true,
-	inverse boolean not null default false,
-	cat_filter boolean not null default false,
-	cat_id integer references ttrss_feed_categories(id) on delete cascade default null,
-	action_id integer not null default 1 references ttrss_filter_actions(id) on delete cascade,
-	action_param varchar(250) not null default '');
-
 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,