From 2457679aedf67f3fc9afb78fc9f888d495171511 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 30 May 2013 18:26:56 +0400
Subject: switch AUTO_ASSIGN_LABELS to off by default (bump schema)

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

diff --git a/include/functions.php b/include/functions.php
index 8dc109f99..a4b604e7d 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
 	define('EXPECTED_CONFIG_VERSION', 26);
-	define('SCHEMA_VERSION', 120);
+	define('SCHEMA_VERSION', 121);
 
 	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 e8d5f64b9..8ba57e123 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -301,7 +301,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 (120);
+insert into ttrss_version values (121);
 
 create table ttrss_enclosures (id integer primary key auto_increment,
 	content_url text not null,
@@ -394,7 +394,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('SSL_CER
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('DIGEST_PREFERRED_TIME', 2, '00:00', 4);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_PREFS_SHOW_EMPTY_CATS', 1, 'false', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_DEFAULT_INCLUDE_CHILDREN', 1, 'false', 1);
-insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('AUTO_ASSIGN_LABELS', 1, 'true', 3);
+insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('AUTO_ASSIGN_LABELS', 1, 'false', 3);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_ENABLED_PLUGINS', 2, '', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_MOBILE_REVERSE_HEADLINES', 1, 'false', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_CSS_THEME', 2, '', 2);
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index feb5cece3..9d0337a07 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -259,7 +259,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 (120);
+insert into ttrss_version values (121);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
@@ -345,7 +345,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('SSL_CER
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('DIGEST_PREFERRED_TIME', 2, '00:00', 4);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_PREFS_SHOW_EMPTY_CATS', 1, 'false', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_DEFAULT_INCLUDE_CHILDREN', 1, 'false', 1);
-insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('AUTO_ASSIGN_LABELS', 1, 'true', 3);
+insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('AUTO_ASSIGN_LABELS', 1, 'false', 3);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_ENABLED_PLUGINS', 2, '', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_MOBILE_REVERSE_HEADLINES', 1, 'false', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_CSS_THEME', 2, '', 2);
diff --git a/schema/versions/mysql/121.sql b/schema/versions/mysql/121.sql
new file mode 100644
index 000000000..d9cf51184
--- /dev/null
+++ b/schema/versions/mysql/121.sql
@@ -0,0 +1,7 @@
+begin;
+
+update ttrss_prefs set def_value = 'false' where pref_name = 'AUTO_ASSIGN_LABELS';
+
+update ttrss_version set schema_version = 121;
+
+commit;
diff --git a/schema/versions/pgsql/121.sql b/schema/versions/pgsql/121.sql
new file mode 100644
index 000000000..d9cf51184
--- /dev/null
+++ b/schema/versions/pgsql/121.sql
@@ -0,0 +1,7 @@
+begin;
+
+update ttrss_prefs set def_value = 'false' where pref_name = 'AUTO_ASSIGN_LABELS';
+
+update ttrss_version set schema_version = 121;
+
+commit;
-- 
cgit v1.2.3