From 3f2ff803b391b719397f606dabd0c182db6ec274 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 30 Jan 2007 17:23:35 +0100 Subject: add interface/schema for inverse matching filters --- schema/obsolete/upgrade-1.2.4-1.2.6-mysql.sql | 12 ++++++++++++ schema/obsolete/upgrade-1.2.4-1.2.6-pgsql.sql | 15 +++++++++++++++ schema/ttrss_schema_mysql.sql | 3 ++- schema/ttrss_schema_pgsql.sql | 3 ++- schema/upgrade-1.2.4-1.2.6-mysql.sql | 12 ------------ schema/upgrade-1.2.4-1.2.6-pgsql.sql | 15 --------------- schema/upgrade-1.2.6-1.2.8-mysql.sql | 6 ++++++ schema/upgrade-1.2.6-1.2.8-pgsql.sql | 10 ++++++++++ 8 files changed, 47 insertions(+), 29 deletions(-) create mode 100644 schema/obsolete/upgrade-1.2.4-1.2.6-mysql.sql create mode 100644 schema/obsolete/upgrade-1.2.4-1.2.6-pgsql.sql delete mode 100644 schema/upgrade-1.2.4-1.2.6-mysql.sql delete mode 100644 schema/upgrade-1.2.4-1.2.6-pgsql.sql create mode 100644 schema/upgrade-1.2.6-1.2.8-mysql.sql create mode 100644 schema/upgrade-1.2.6-1.2.8-pgsql.sql (limited to 'schema') diff --git a/schema/obsolete/upgrade-1.2.4-1.2.6-mysql.sql b/schema/obsolete/upgrade-1.2.4-1.2.6-mysql.sql new file mode 100644 index 000000000..73af4e375 --- /dev/null +++ b/schema/obsolete/upgrade-1.2.4-1.2.6-mysql.sql @@ -0,0 +1,12 @@ +alter table ttrss_filters add column action_param varchar(200); + +update ttrss_filters set action_param = ''; + +alter table ttrss_filters change action_param action_param varchar(200) not null; +alter table ttrss_filters alter column action_param set default ''; + +insert into ttrss_filter_actions (id,name,description) values (4, 'tag', + 'Assign tags'); + +update ttrss_version set schema_version = 12; + diff --git a/schema/obsolete/upgrade-1.2.4-1.2.6-pgsql.sql b/schema/obsolete/upgrade-1.2.4-1.2.6-pgsql.sql new file mode 100644 index 000000000..6de90f1ab --- /dev/null +++ b/schema/obsolete/upgrade-1.2.4-1.2.6-pgsql.sql @@ -0,0 +1,15 @@ +begin; + +alter table ttrss_filters add column action_param varchar(200); + +update ttrss_filters set action_param = ''; + +alter table ttrss_filters alter column action_param set not null; +alter table ttrss_filters alter column action_param set default ''; + +insert into ttrss_filter_actions (id,name,description) values (4, 'tag', + 'Assign tags'); + +update ttrss_version set schema_version = 12; + +commit; 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.4-1.2.6-mysql.sql b/schema/upgrade-1.2.4-1.2.6-mysql.sql deleted file mode 100644 index 73af4e375..000000000 --- a/schema/upgrade-1.2.4-1.2.6-mysql.sql +++ /dev/null @@ -1,12 +0,0 @@ -alter table ttrss_filters add column action_param varchar(200); - -update ttrss_filters set action_param = ''; - -alter table ttrss_filters change action_param action_param varchar(200) not null; -alter table ttrss_filters alter column action_param set default ''; - -insert into ttrss_filter_actions (id,name,description) values (4, 'tag', - 'Assign tags'); - -update ttrss_version set schema_version = 12; - diff --git a/schema/upgrade-1.2.4-1.2.6-pgsql.sql b/schema/upgrade-1.2.4-1.2.6-pgsql.sql deleted file mode 100644 index 6de90f1ab..000000000 --- a/schema/upgrade-1.2.4-1.2.6-pgsql.sql +++ /dev/null @@ -1,15 +0,0 @@ -begin; - -alter table ttrss_filters add column action_param varchar(200); - -update ttrss_filters set action_param = ''; - -alter table ttrss_filters alter column action_param set not null; -alter table ttrss_filters alter column action_param set default ''; - -insert into ttrss_filter_actions (id,name,description) values (4, 'tag', - 'Assign tags'); - -update ttrss_version set schema_version = 12; - -commit; 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; -- cgit v1.2.3