Merge branch 'master' of git.fakecake.org:tt-rss into pdo-experimental

[tt-rss.git] / schema / ttrss_schema_mysql.sql

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 296049083fd42436e26244adf242fad58088c120..ce299f4e0156b373bab314d17585d6d75c8c9c3d 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -101,8 +101,10 @@ 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_unconditional datetime default null,
        last_error varchar(250) not null default '',
+       last_modified varchar(250) not null default '',
        favicon_avg_color varchar(11) default null,
        site_url varchar(250) not null default '',
        auth_login varchar(250) not null default '',
@@ -252,6 +254,7 @@ create table ttrss_filters2_rules(id integer primary key auto_increment,
        feed_id integer default null,
        cat_id integer default null,
        cat_filter boolean not null default false,
+       match_on text,
        index (filter_id),
        foreign key (filter_id) references ttrss_filters2(id) on delete cascade,
        index (filter_type),
@@ -281,7 +284,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 (133);
 
 create table ttrss_enclosures (id integer primary key auto_increment,
        content_url text not null,