From 881a1580320d5bb72fee9eee255d23b9d6e9a102 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 9 Apr 2013 22:26:38 +0400
Subject: [PATCH] update default of allow_duplicate_posts to false, bump schema

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

diff --git a/include/functions.php b/include/functions.php
index c4eed06a1..ddb719507 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
 	define('EXPECTED_CONFIG_VERSION', 26);
-	define('SCHEMA_VERSION', 115);
+	define('SCHEMA_VERSION', 116);
 
 	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 40c256f62..9ed63f42a 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -298,7 +298,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 (115);
+insert into ttrss_version values (116);
 
 create table ttrss_enclosures (id integer primary key auto_increment,
 	content_url text not null,
@@ -347,7 +347,7 @@ create index ttrss_prefs_pref_name_idx on ttrss_prefs(pref_name);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('PURGE_OLD_DAYS', 3, '60', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('DEFAULT_UPDATE_INTERVAL', 3, '30', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('DEFAULT_ARTICLE_LIMIT', 3, '30', 2);
-insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('ALLOW_DUPLICATE_POSTS', 1, 'true', 1);
+insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('ALLOW_DUPLICATE_POSTS', 1, 'false', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('ENABLE_FEED_CATS', 1, 'true', 2);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('SHOW_CONTENT_PREVIEW', 1, 'true', 2);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('SHORT_DATE_FORMAT', 2, 'M d, G:i', 3);
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 565271f11..ec3b778cc 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -256,7 +256,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 (115);
+insert into ttrss_version values (116);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
@@ -298,7 +298,7 @@ create index ttrss_prefs_pref_name_idx on ttrss_prefs(pref_name);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('PURGE_OLD_DAYS', 3, '60', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('DEFAULT_UPDATE_INTERVAL', 3, '30', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('DEFAULT_ARTICLE_LIMIT', 3, '30', 2);
-insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('ALLOW_DUPLICATE_POSTS', 1, 'true', 1);
+insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('ALLOW_DUPLICATE_POSTS', 1, 'false', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('ENABLE_FEED_CATS', 1, 'true', 2);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('SHOW_CONTENT_PREVIEW', 1, 'true', 2);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('SHORT_DATE_FORMAT', 2, 'M d, G:i', 3);
diff --git a/schema/versions/mysql/116.sql b/schema/versions/mysql/116.sql
new file mode 100644
index 000000000..252ba0e3a
--- /dev/null
+++ b/schema/versions/mysql/116.sql
@@ -0,0 +1,7 @@
+begin;
+
+update ttrss_prefs set def_value = 'false' where pref_name = 'ALLOW_DUPLICATE_POSTS';
+
+update ttrss_version set schema_version = 116;
+
+commit;
diff --git a/schema/versions/pgsql/116.sql b/schema/versions/pgsql/116.sql
new file mode 100644
index 000000000..252ba0e3a
--- /dev/null
+++ b/schema/versions/pgsql/116.sql
@@ -0,0 +1,7 @@
+begin;
+
+update ttrss_prefs set def_value = 'false' where pref_name = 'ALLOW_DUPLICATE_POSTS';
+
+update ttrss_version set schema_version = 116;
+
+commit;