From 8e8c8934a9da12bf9e47316079407b8e62edcd7b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 31 Mar 2013 16:14:42 +0400 Subject: add necessary schema plumbing to implement filter ordering also add filter titles --- schema/ttrss_schema_mysql.sql | 4 +++- schema/ttrss_schema_pgsql.sql | 4 +++- schema/versions/mysql/112.sql | 15 +++++++++++++++ schema/versions/pgsql/112.sql | 15 +++++++++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 schema/versions/mysql/112.sql create mode 100644 schema/versions/pgsql/112.sql (limited to 'schema') diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index dce3921d5..40d5c67f5 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -251,6 +251,8 @@ create table ttrss_filters2(id integer primary key auto_increment, match_any_rule boolean not null default false, enabled boolean not null default true, inverse bool not null default false, + title varchar(250) not null default '', + order_id integer not null default 0, index(owner_uid), foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8; @@ -291,7 +293,7 @@ create table ttrss_tags (id integer primary key auto_increment, create table ttrss_version (schema_version int not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8; -insert into ttrss_version values (111); +insert into ttrss_version values (112); create table ttrss_enclosures (id integer primary key auto_increment, content_url text not null, diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql index 8ef7f0805..711a35968 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -223,6 +223,8 @@ 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, inverse boolean not null default false, + title varchar(250) not null default '', + order_id integer not null default 0, enabled boolean not null default true); create table ttrss_filters2_rules(id serial not null primary key, @@ -249,7 +251,7 @@ create index ttrss_tags_post_int_id_idx on ttrss_tags(post_int_id); create table ttrss_version (schema_version int not null); -insert into ttrss_version values (111); +insert into ttrss_version values (112); create table ttrss_enclosures (id serial not null primary key, content_url text not null, diff --git a/schema/versions/mysql/112.sql b/schema/versions/mysql/112.sql new file mode 100644 index 000000000..a6f0b200b --- /dev/null +++ b/schema/versions/mysql/112.sql @@ -0,0 +1,15 @@ +begin; + +alter table ttrss_filters2 add column order_id integer; +update ttrss_filters2 set order_id = 0; +alter table ttrss_filters2 change order_id order_id integer not null; +alter table ttrss_filters2 alter column order_id set default 0; + +alter table ttrss_filters2 add column title varchar(250); +update ttrss_filters2 set title = ''; +alter table ttrss_filters2 change title title varchar(250) not null; +alter table ttrss_filters2 alter column title set default ''; + +update ttrss_version set schema_version = 112; + +commit; diff --git a/schema/versions/pgsql/112.sql b/schema/versions/pgsql/112.sql new file mode 100644 index 000000000..a9d90d6d4 --- /dev/null +++ b/schema/versions/pgsql/112.sql @@ -0,0 +1,15 @@ +begin; + +alter table ttrss_filters2 add column order_id integer; +update ttrss_filters2 set order_id = 0; +alter table ttrss_filters2 alter column order_id set not null; +alter table ttrss_filters2 alter column order_id set default 0; + +alter table ttrss_filters2 add column title varchar(250); +update ttrss_filters2 set title = ''; +alter table ttrss_filters2 alter column title set not null; +alter table ttrss_filters2 alter column title set default ''; + +update ttrss_version set schema_version = 112; + +commit; -- cgit v1.2.3