add ttrss_user_entries.score; bump schema

diff --git a/sanity_check.php b/sanity_check.php
index 3735d6c4fc31f0bf6f19740a2b1888efb0c00c46..167fef683dab9e86dffa2fede4e025215bd920a3 100644 (file)
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -2,7 +2,7 @@
        require_once "functions.php";
 
        define('EXPECTED_CONFIG_VERSION', 15);
-       define('SCHEMA_VERSION', 35);
+       define('SCHEMA_VERSION', 36);
 
        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 f2daa69fbc9ba7a6f815db72538ddaeabbc16741..819ee216a3967f9b432f60b2ee8df71bb8d8d5bb 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -115,6 +115,7 @@ create table ttrss_user_entries (
        marked bool not null default 0,
        published bool not null default 0,
        last_read datetime,
+       score int not null default 0,
        unread bool not null default 1,
        index (ref_id),
        foreign key (ref_id) references ttrss_entries(id) ON DELETE CASCADE,
@@ -205,7 +206,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 (35);
+insert into ttrss_version values (36);
 
 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 c35781a698212ffbc978cfedaf3f16a8f87c0380..0bfe4d8b18a2d6c6892ad5d297e904461b04f563 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -107,6 +107,7 @@ create table ttrss_user_entries (
        marked boolean not null default false,
        published boolean not null default false,
        last_read timestamp,
+       score int not null default 0,
        unread boolean not null default true);
 
 -- create index ttrss_user_entries_feed_id_index on ttrss_user_entries(feed_id);
@@ -185,7 +186,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 (35);
+insert into ttrss_version values (36);
 
 create table ttrss_enclosures (id serial not null primary key,
        content_url text not null,

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

diff --git a/schema/versions/pgsql/36.sql b/schema/versions/pgsql/36.sql
new file mode 100644 (file)
index 0000000..6b61cad
--- /dev/null
+++ b/schema/versions/pgsql/36.sql
@@ -0,0 +1,6 @@
+alter table ttrss_user_entries add column score int;
+update ttrss_user_entries set score = 0;
+alter table ttrss_user_entries alter column score set not null;
+alter table ttrss_user_entries alter column score set default 0;
+
+update ttrss_version set schema_version = 36;