From 10a1f28f7c532455a17a15b158f965fd1fea9d51 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Jul 2017 20:59:24 +0300
Subject: [PATCH] schema: updates for new filter format (bump version to 131)

---
 include/functions.php         | 2 +-
 schema/ttrss_schema_mysql.sql | 3 ++-
 schema/ttrss_schema_pgsql.sql | 3 ++-
 schema/versions/mysql/131.sql | 7 +++++++
 schema/versions/pgsql/131.sql | 7 +++++++
 5 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 schema/versions/mysql/131.sql
 create mode 100644 schema/versions/pgsql/131.sql

diff --git a/include/functions.php b/include/functions.php
index 4ad6e6394..492d2b635 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
 	define('EXPECTED_CONFIG_VERSION', 26);
-	define('SCHEMA_VERSION', 130);
+	define('SCHEMA_VERSION', 131);
 
 	define('LABEL_BASE_INDEX', -1024);
 	define('PLUGIN_FEED_BASE_INDEX', -128);
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 0b16eb2ea..1ec409661 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -252,6 +252,7 @@ create table ttrss_filters2_rules(id integer primary key auto_increment,
 	feed_id integer default null,
 	cat_id integer default null,
 	cat_filter boolean not null default false,
+	match_on text,
 	index (filter_id),
 	foreign key (filter_id) references ttrss_filters2(id) on delete cascade,
 	index (filter_type),
@@ -281,7 +282,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 (130);
+insert into ttrss_version values (131);
 
 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 237f1d3fb..6db73cd51 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -246,6 +246,7 @@ create table ttrss_filters2_rules(id serial not null primary key,
 	filter_type integer not null references ttrss_filter_types(id),
 	feed_id integer references ttrss_feeds(id) on delete cascade default null,
 	cat_id integer references ttrss_feed_categories(id) on delete cascade default null,
+	match_on text,
 	cat_filter boolean not null default false);
 
 create table ttrss_filters2_actions(id serial not null primary key,
@@ -263,7 +264,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 (130);
+insert into ttrss_version values (131);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
diff --git a/schema/versions/mysql/131.sql b/schema/versions/mysql/131.sql
new file mode 100644
index 000000000..9316b7f41
--- /dev/null
+++ b/schema/versions/mysql/131.sql
@@ -0,0 +1,7 @@
+BEGIN;
+
+ALTER TABLE ttrss_filters2_rules ADD COLUMN match_on TEXT;
+
+UPDATE ttrss_version SET schema_version = 131;
+
+COMMIT;
diff --git a/schema/versions/pgsql/131.sql b/schema/versions/pgsql/131.sql
new file mode 100644
index 000000000..9b3001221
--- /dev/null
+++ b/schema/versions/pgsql/131.sql
@@ -0,0 +1,7 @@
+BEGIN;
+
+ALTER table ttrss_filters2_rules ADD COLUMN match_on TEXT;
+
+UPDATE ttrss_version SET schema_version = 131;
+
+COMMIT;