From 6497fb65b439f02cf145c2d0eb4e40803641fbb4 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Wed, 18 Nov 2015 14:33:47 +0300
Subject: [PATCH] fix ttrss_feeds.last_update defaulting to 0 on mysql, set to
 null instead

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

diff --git a/include/functions.php b/include/functions.php
index e91072271..92d6e9790 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
 	define('EXPECTED_CONFIG_VERSION', 26);
-	define('SCHEMA_VERSION', 129);
+	define('SCHEMA_VERSION', 130);
 
 	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 296049083..0b16eb2ea 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -101,7 +101,7 @@ create table ttrss_feeds (id integer not null auto_increment primary key,
 	icon_url varchar(250) not null default '',
 	update_interval integer not null default 0,
 	purge_interval integer not null default 0,
-	last_updated datetime default 0,
+	last_updated datetime default null,
 	last_error varchar(250) not null default '',
 	favicon_avg_color varchar(11) default null,
 	site_url varchar(250) not null default '',
@@ -281,7 +281,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 (129);
+insert into ttrss_version values (130);
 
 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 b53d375cc..237f1d3fb 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -263,7 +263,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 (129);
+insert into ttrss_version values (130);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
diff --git a/schema/versions/mysql/130.sql b/schema/versions/mysql/130.sql
new file mode 100644
index 000000000..7b90d4d2c
--- /dev/null
+++ b/schema/versions/mysql/130.sql
@@ -0,0 +1,7 @@
+BEGIN;
+
+alter table ttrss_feeds alter column last_updated set default null;
+
+UPDATE ttrss_version SET schema_version = 130;
+
+COMMIT;
diff --git a/schema/versions/pgsql/130.sql b/schema/versions/pgsql/130.sql
new file mode 100644
index 000000000..820f0b6a8
--- /dev/null
+++ b/schema/versions/pgsql/130.sql
@@ -0,0 +1,5 @@
+BEGIN;
+
+UPDATE ttrss_version SET schema_version = 130;
+
+COMMIT;