summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sanity_check.php2
-rw-r--r--schema/ttrss_schema_mysql.sql4
-rw-r--r--schema/ttrss_schema_pgsql.sql4
-rw-r--r--schema/versions/mysql/81.sql7
-rw-r--r--schema/versions/pgsql/81.sql7
5 files changed, 19 insertions, 5 deletions
diff --git a/sanity_check.php b/sanity_check.php
index 83dacb15c..e6e58b2ab 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 "<b>Fatal Error</b>: You forgot to copy
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 717984210..a7c555cba 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 cb0d39ea6..d73206411 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 000000000..800ceede0
--- /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 000000000..800ceede0
--- /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;