summaryrefslogtreecommitdiff
path: root/schema
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-03-29 19:37:36 +0400
committerAndrew Dolgov <[email protected]>2013-03-29 19:37:42 +0400
commit9cac360bd7783830e5b4ee20615d57755f7ddc15 (patch)
tree5eab840d83dbf1f8a581bbabfae0679aa437afc8 /schema
parentc409d34a3009005be41efbc6c8cdf994bddaae35 (diff)
set combined display mode as default
Diffstat (limited to 'schema')
-rw-r--r--schema/ttrss_schema_mysql.sql4
-rw-r--r--schema/ttrss_schema_pgsql.sql4
-rw-r--r--schema/versions/mysql/111.sql7
-rw-r--r--schema/versions/pgsql/111.sql7
4 files changed, 18 insertions, 4 deletions
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 4b3535861..dce3921d5 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 (110);
+insert into ttrss_version values (111);
create table ttrss_enclosures (id integer primary key auto_increment,
content_url text not null,
@@ -355,7 +355,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) values('SHORT_DATE_FORMAT', 2, 'M d, G:i', 'Short date format',3);
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('LONG_DATE_FORMAT', 2, 'D, M d Y - G:i', 'Long date format',3);
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('COMBINED_DISPLAY_MODE', 1, 'false', 'Combined feed display',2, 'Display expanded list of feed articles, instead of separate displays for headlines and article content');
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('COMBINED_DISPLAY_MODE', 1, 'true', 'Combined feed display',2, 'Display expanded list of feed articles, instead of separate displays for headlines and article content');
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('HIDE_READ_FEEDS', 1, 'false', 'Hide feeds with no unread articles',2);
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 5117f2e9c..8ef7f0805 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 (110);
+insert into ttrss_version values (111);
create table ttrss_enclosures (id serial not null primary key,
content_url text not null,
@@ -305,7 +305,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) values('SHORT_DATE_FORMAT', 2, 'M d, G:i', 'Short date format',3);
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('LONG_DATE_FORMAT', 2, 'D, M d Y - G:i', 'Long date format',3);
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('COMBINED_DISPLAY_MODE', 1, 'false', 'Combined feed display',2, 'Display expanded list of feed articles, instead of separate displays for headlines and article content');
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('COMBINED_DISPLAY_MODE', 1, 'true', 'Combined feed display',2, 'Display expanded list of feed articles, instead of separate displays for headlines and article content');
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('HIDE_READ_FEEDS', 1, 'false', 'Hide feeds with no unread articles',2);
diff --git a/schema/versions/mysql/111.sql b/schema/versions/mysql/111.sql
new file mode 100644
index 000000000..27f287d1a
--- /dev/null
+++ b/schema/versions/mysql/111.sql
@@ -0,0 +1,7 @@
+begin;
+
+update ttrss_prefs set def_value = 'true' where pref_name = 'COMBINED_DISPLAY_MODE';
+
+update ttrss_version set schema_version = 111;
+
+commit;
diff --git a/schema/versions/pgsql/111.sql b/schema/versions/pgsql/111.sql
new file mode 100644
index 000000000..27f287d1a
--- /dev/null
+++ b/schema/versions/pgsql/111.sql
@@ -0,0 +1,7 @@
+begin;
+
+update ttrss_prefs set def_value = 'true' where pref_name = 'COMBINED_DISPLAY_MODE';
+
+update ttrss_version set schema_version = 111;
+
+commit;