schema: add ttrss_feeds.update_method, bump version

diff --git a/sanity_check.php b/sanity_check.php
index 2dfa75a83668407a55010f71319207c5976fd36b..250505d00c31167070ba8cb278b58d5e55d20226 100644 (file)
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -2,7 +2,7 @@
        require_once "functions.php";
 
        define('EXPECTED_CONFIG_VERSION', 14);
-       define('SCHEMA_VERSION', 30);
+       define('SCHEMA_VERSION', 31);
 
        if (!file_exists("config.php")) {
                print __("<b>Fatal Error</b>: You forgot to copy 

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index a63a4133dab25bf6888b1131933c0f253d502d19..240961d03d9d0d8dae586fff54cbf171a14d3123 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -78,6 +78,7 @@ create table ttrss_feeds (id integer not null auto_increment primary key,
        auth_pass_encrypted boolean not null default false,
        last_viewed datetime default null,
        last_update_started datetime default null,
+       update_method integer not null default 0,
        index(owner_uid),
        foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE,
        index(cat_id),
@@ -204,7 +205,7 @@ create table ttrss_tags (id integer primary key auto_increment,
 
 create table ttrss_version (schema_version int not null) TYPE=InnoDB;
 
-insert into ttrss_version values (30);
+insert into ttrss_version values (31);
 
 create table ttrss_enclosures (id serial not null primary key,
        content_url text not null,

diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 942183bfc1dc940e1b60df6286b9acdafc1e776e..8ffce3513afacbdb8707b7bf8fcf93a84be48d94 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -70,6 +70,7 @@ create table ttrss_feeds (id serial not null primary key,
        cache_images boolean not null default false,
        last_viewed timestamp default null,
        last_update_started timestamp default null,
+       update_method integer not null default 0,
        auth_pass_encrypted boolean not null default false);    
 
 create index ttrss_feeds_owner_uid_index on ttrss_feeds(owner_uid);
@@ -183,7 +184,7 @@ create index ttrss_tags_owner_uid_index on ttrss_tags(owner_uid);
 
 create table ttrss_version (schema_version int not null);
 
-insert into ttrss_version values (30);
+insert into ttrss_version values (31);
 
 create table ttrss_enclosures (id serial not null primary key,
        content_url text not null,

diff --git a/schema/versions/mysql/31.sql b/schema/versions/mysql/31.sql
new file mode 100644 (file)
index 0000000..94cfc14
--- /dev/null
+++ b/schema/versions/mysql/31.sql
@@ -0,0 +1,6 @@
+alter table ttrss_feeds add column update_method integer;
+update ttrss_feeds set update_method = 0;
+alter table ttrss_feeds change update_method update_method integer not null;
+alter table ttrss_feeds alter column update_method set default 0;
+
+update ttrss_version set schema_version = 31;

diff --git a/schema/versions/pgsql/31.sql b/schema/versions/pgsql/31.sql
new file mode 100644 (file)
index 0000000..e8d6bdb
--- /dev/null
+++ b/schema/versions/pgsql/31.sql
@@ -0,0 +1,6 @@
+alter table ttrss_feeds add column update_method integer;
+update ttrss_feeds set update_method = 0;
+alter table ttrss_feeds alter column update_method set not null;
+alter table ttrss_feeds alter column update_method set default 0;
+
+update ttrss_version set schema_version = 31;