From 24c0e2e57ddbe97123c8dbb3d52d6e67f89a4ea0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 26 Mar 2013 09:08:42 +0400
Subject: [PATCH] schema: disable sort headlines by feed date by default

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

diff --git a/include/functions.php b/include/functions.php
index 452bc2ba..73788071 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
 	define('EXPECTED_CONFIG_VERSION', 26);
-	define('SCHEMA_VERSION', 107);
+	define('SCHEMA_VERSION', 108);
 
 	$fetch_last_error = false;
 	$pluginhost = false;
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 9239ef39..2c7a559c 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -291,7 +291,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 (107);
+insert into ttrss_version values (108);
 
 create table ttrss_enclosures (id integer primary key auto_increment,
 	content_url text not null,
@@ -421,7 +421,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('USER_STYLESHEET', 2, '', 'Customize stylesheet', 2, 'Customize CSS stylesheet to your liking');
 
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('SORT_HEADLINES_BY_FEED_DATE', 1, 'true', 'Sort headlines by feed date',2, 'Use feed-specified date to sort headlines instead of local import date.');
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('SORT_HEADLINES_BY_FEED_DATE', 1, 'false', 'Sort headlines by feed date',2, 'Use feed-specified date to sort headlines instead of local import date.');
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_BROWSE_CATS', 1, 'true', '', 1);
 
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 6b470ca3..a3c11456 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -249,7 +249,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 (107);
+insert into ttrss_version values (108);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
@@ -371,7 +371,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('USER_STYLESHEET', 2, '', 'Customize stylesheet', 2, 'Customize CSS stylesheet to your liking');
 
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('SORT_HEADLINES_BY_FEED_DATE', 1, 'true', 'Sort headlines by feed date',2, 'Use feed-specified date to sort headlines instead of local import date.');
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('SORT_HEADLINES_BY_FEED_DATE', 1, 'false', 'Sort headlines by feed date',2, 'Use feed-specified date to sort headlines instead of local import date.');
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_BROWSE_CATS', 1, 'true', '', 1);
 
diff --git a/schema/versions/mysql/108.sql b/schema/versions/mysql/108.sql
new file mode 100644
index 00000000..899be8bb
--- /dev/null
+++ b/schema/versions/mysql/108.sql
@@ -0,0 +1,7 @@
+begin;
+
+update ttrss_prefs set def_value = 'false' where pref_name = 'SORT_HEADLINES_BY_FEED_DATE';
+
+update ttrss_version set schema_version = 108;
+
+commit;
diff --git a/schema/versions/pgsql/108.sql b/schema/versions/pgsql/108.sql
new file mode 100644
index 00000000..899be8bb
--- /dev/null
+++ b/schema/versions/pgsql/108.sql
@@ -0,0 +1,7 @@
+begin;
+
+update ttrss_prefs set def_value = 'false' where pref_name = 'SORT_HEADLINES_BY_FEED_DATE';
+
+update ttrss_version set schema_version = 108;
+
+commit;