From b9ad7cface725225ec84f0b5b52731c0b4953c01 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 10 Mar 2011 11:54:10 +0300 Subject: [PATCH] change description of filter 'filter' action (bump schema) --- sanity_check.php | 2 +- schema/ttrss_schema_mysql.sql | 4 ++-- schema/ttrss_schema_pgsql.sql | 4 ++-- schema/versions/mysql/81.sql | 7 +++++++ schema/versions/pgsql/81.sql | 7 +++++++ 5 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 schema/versions/mysql/81.sql create mode 100644 schema/versions/pgsql/81.sql diff --git a/sanity_check.php b/sanity_check.php index 83dacb15..e6e58b2a 100644 --- a/sanity_check.php +++ b/sanity_check.php @@ -2,7 +2,7 @@ require_once "functions.php"; define('EXPECTED_CONFIG_VERSION', 21); - define('SCHEMA_VERSION', 80); + define('SCHEMA_VERSION', 81); if (!file_exists("config.php")) { print "Fatal Error: You forgot to copy diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 71798421..a7c555cb 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -208,7 +208,7 @@ create table ttrss_filter_actions (id integer not null primary key, description varchar(250) not null unique) TYPE=InnoDB DEFAULT CHARSET=UTF8; insert into ttrss_filter_actions (id,name,description) values (1, 'filter', - 'Filter article'); + 'Delete article'); insert into ttrss_filter_actions (id,name,description) values (2, 'catchup', 'Mark as read'); @@ -258,7 +258,7 @@ create table ttrss_tags (id integer primary key auto_increment, create table ttrss_version (schema_version int not null) TYPE=InnoDB DEFAULT CHARSET=UTF8; -insert into ttrss_version values (80); +insert into ttrss_version values (81); 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 cb0d39ea..d7320641 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -188,7 +188,7 @@ create table ttrss_filter_actions (id integer not null primary key, description varchar(250) not null unique); insert into ttrss_filter_actions (id,name,description) values (1, 'filter', - 'Filter article'); + 'Delete article'); insert into ttrss_filter_actions (id,name,description) values (2, 'catchup', 'Mark as read'); @@ -229,7 +229,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 (80); +insert into ttrss_version values (81); create table ttrss_enclosures (id serial not null primary key, content_url text not null, diff --git a/schema/versions/mysql/81.sql b/schema/versions/mysql/81.sql new file mode 100644 index 00000000..800ceede --- /dev/null +++ b/schema/versions/mysql/81.sql @@ -0,0 +1,7 @@ +begin; + +update ttrss_filter_actions set description = 'Delete article' where name = 'filter'; + +update ttrss_version set schema_version = 81; + +commit; diff --git a/schema/versions/pgsql/81.sql b/schema/versions/pgsql/81.sql new file mode 100644 index 00000000..800ceede --- /dev/null +++ b/schema/versions/pgsql/81.sql @@ -0,0 +1,7 @@ +begin; + +update ttrss_filter_actions set description = 'Delete article' where name = 'filter'; + +update ttrss_version set schema_version = 81; + +commit;