implement multiple rule/action filters

2 files changed, 61 insertions, 0 deletions

diff --git a/schema/versions/mysql/96.sql b/schema/versions/mysql/96.sql
new file mode 100644
index 000000000..4d4e2445c
--- /dev/null
+++ b/schema/versions/mysql/96.sql
@@ -0,0 +1,38 @@
+begin;
+
+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,
+	index(owner_uid),
+	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+	
+create table ttrss_filters2_rules(id integer primary key auto_increment,
+	filter_id integer not null references ttrss_filters2(id) on delete cascade,
+	reg_exp varchar(250) not null,
+	filter_type integer not null,
+	feed_id integer default null,
+	cat_id integer default null,
+	cat_filter boolean not null default false,
+	index (filter_id),
+	foreign key (filter_id) references ttrss_filters2(id) on delete cascade,
+	index (filter_type),
+	foreign key (filter_type) references ttrss_filter_types(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) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create table ttrss_filters2_actions(id integer primary key auto_increment,
+	filter_id integer not null,
+	action_id integer not null default 1 references ttrss_filter_actions(id) on delete cascade,
+	action_param varchar(250) not null default '',
+	index (filter_id),
+	foreign key (filter_id) references ttrss_filters2(id) on delete cascade,
+	index (action_id),
+	foreign key (action_id) references ttrss_filter_actions(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+update ttrss_version set schema_version = 96;
+
+commit;
+
diff --git a/schema/versions/pgsql/96.sql b/schema/versions/pgsql/96.sql
new file mode 100644
index 000000000..86895e5e0
--- /dev/null
+++ b/schema/versions/pgsql/96.sql
@@ -0,0 +1,23 @@
+begin;
+
+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,
+	enabled boolean not null default true);
+	
+create table ttrss_filters2_rules(id serial not null primary key,
+	filter_id integer not null references ttrss_filters2(id) on delete cascade,
+	reg_exp varchar(250) not null,
+	filter_type integer not null references ttrss_filter_types(id),
+	feed_id integer references ttrss_feeds(id) on delete cascade default null,
+	cat_id integer references ttrss_feed_categories(id) on delete cascade default null,
+	cat_filter boolean not null default false);
+
+create table ttrss_filters2_actions(id serial not null primary key,
+	filter_id integer not null references ttrss_filters2(id) on delete cascade,
+	action_id integer not null default 1 references ttrss_filter_actions(id) on delete cascade,
+	action_param varchar(250) not null default '');
+
+update ttrss_version set schema_version = 95;
+
+commit;