change description of filter 'filter' action (bump schema)

diff --git a/sanity_check.php b/sanity_check.php
index 83dacb15c00d73b0b32693804d30d2b15674d206..e6e58b2ab76cf7a75316f4faa464f6f79377fa0b 100644 (file)
--- 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 "<b>Fatal Error</b>: You forgot to copy 

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 71798421011717c4d75b6849e2a4e7cf581829b8..a7c555cbaf7ea0072b7cae2ed32356b3593a30c3 100644 (file)
--- 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 cb0d39ea616560858afcaab15ff177e822493164..d732064115433eb7f70b9c1ff28a29b628e3d0d1 100644 (file)
--- 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 (file)
index 0000000..800ceed
--- /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 (file)
index 0000000..800ceed
--- /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;