schema: add ttrss_feeds.order_id

diff --git a/sanity_check.php b/sanity_check.php
index 7e792f379aab8a9fd17c1e75586eca7231629ce6..4b77e92bbe5e6bda762839a335c3257f175258ee 100644 (file)
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -2,7 +2,7 @@
        require_once "functions.php";
 
        define('EXPECTED_CONFIG_VERSION', 20);
-       define('SCHEMA_VERSION', 74);
+       define('SCHEMA_VERSION', 75);
 
        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 adf158c6f9193dfc06dc97614140e4f9b98facac..9e65442a55467d89e2665df6a7d457e09d196816 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -114,6 +114,7 @@ create table ttrss_feeds (id integer not null auto_increment primary key,
        last_update_started datetime default null,
        always_display_enclosures boolean not null default false,
        update_method integer not null default 0,
+       order_id integer not null default 0,
        index(owner_uid),
        foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE,
        index(cat_id),
@@ -246,7 +247,7 @@ create table ttrss_tags (id integer primary key auto_increment,
 
 create table ttrss_version (schema_version int not null) TYPE=InnoDB DEFAULT CHARSET=UTF8;
 
-insert into ttrss_version values (74);
+insert into ttrss_version values (75);
 
 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 dd62d17b0fe24055a440b1748a4fe95f0c2c8035..d8fab88ebd83c6408f2a0ffe8237a2b08191fce7 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -83,6 +83,7 @@ create table ttrss_feeds (id serial not null primary key,
        last_update_started timestamp default null,
        update_method integer not null default 0,
        always_display_enclosures boolean not null default false,
+       order_id 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);
@@ -221,7 +222,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 (74);
+insert into ttrss_version values (75);
 
 create table ttrss_enclosures (id serial not null primary key,
        content_url text not null,

diff --git a/schema/versions/mysql/75.sql b/schema/versions/mysql/75.sql
new file mode 100644 (file)
index 0000000..c9017b9
--- /dev/null
+++ b/schema/versions/mysql/75.sql
@@ -0,0 +1,10 @@
+begin;
+
+alter table ttrss_feeds add column order_id integer;
+update ttrss_feeds set order_id = 0;
+alter table ttrss_feeds change order_id order_id integer not null;
+alter table ttrss_feeds alter column order_id set default 0;
+
+update ttrss_version set schema_version = 75;
+
+commit;

diff --git a/schema/versions/pgsql/75.sql b/schema/versions/pgsql/75.sql
new file mode 100644 (file)
index 0000000..3291d65
--- /dev/null
+++ b/schema/versions/pgsql/75.sql
@@ -0,0 +1,10 @@
+begin;
+
+alter table ttrss_feeds add column order_id integer;
+update ttrss_feeds set order_id = 0;
+alter table ttrss_feeds alter column order_id set not null;
+alter table ttrss_feeds alter column order_id set default 0;
+
+update ttrss_version set schema_version = 75;
+
+commit;