fix ttrss_feeds.last_update defaulting to 0 on mysql, set to null instead

bump schema

diff --git a/include/functions.php b/include/functions.php
index e91072271273afa1f04ee4618143296dc40300d7..92d6e9790b7d8a055d1c721ba2a10faa003c6106 100644 (file)
--- 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 296049083fd42436e26244adf242fad58088c120..0b16eb2ea7b7e8cf4423d34df659be0b0c0ca038 100644 (file)
--- 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 b53d375cc6d30e90f93281080d30ed826e60b919..237f1d3fbb36fb2ed3a4f48ea16cd5508b713683 100644 (file)
--- 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 (file)
index 0000000..7b90d4d
--- /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 (file)
index 0000000..820f0b6
--- /dev/null
+++ b/schema/versions/pgsql/130.sql
@@ -0,0 +1,5 @@
+BEGIN;
+
+UPDATE ttrss_version SET schema_version = 130;
+
+COMMIT;