From 8e8c8934a9da12bf9e47316079407b8e62edcd7b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sun, 31 Mar 2013 16:14:42 +0400
Subject: [PATCH] add necessary schema plumbing to implement filter ordering
 also add filter titles

---
 include/functions.php         |  4 ++--
 schema/ttrss_schema_mysql.sql |  4 +++-
 schema/ttrss_schema_pgsql.sql |  4 +++-
 schema/versions/mysql/112.sql | 15 +++++++++++++++
 schema/versions/pgsql/112.sql | 15 +++++++++++++++
 5 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 schema/versions/mysql/112.sql
 create mode 100644 schema/versions/pgsql/112.sql

diff --git a/include/functions.php b/include/functions.php
index b9c30c6c..9f75fc23 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
 	define('EXPECTED_CONFIG_VERSION', 26);
-	define('SCHEMA_VERSION', 111);
+	define('SCHEMA_VERSION', 112);
 
 	define('LABEL_BASE_INDEX', -1024);
 	define('PLUGIN_FEED_BASE_INDEX', -128);
@@ -3192,7 +3192,7 @@
 		$cat_id = (int)getFeedCategory($link, $feed_id);
 
 		$result = db_query($link, "SELECT * FROM ttrss_filters2 WHERE
-			owner_uid = $owner_uid AND enabled = true");
+			owner_uid = $owner_uid AND enabled = true ORDER BY order_id, title");
 
 		$check_cats = join(",", array_merge(
 			getParentCategories($link, $cat_id, $owner_uid),
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index dce3921d..40d5c67f 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 8ef7f080..711a3596 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 00000000..a6f0b200
--- /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 00000000..a9d90d6d
--- /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;