drop ttrss_filters from the schema

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

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index d4531308f80c92f2f4bf6757a8f940e081742025..9239ef397a0696196d569e28cdd2918735f8bd7b 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -13,7 +13,6 @@ drop table if exists ttrss_labels;
 drop table if exists ttrss_filters2_actions;
 drop table if exists ttrss_filters2_rules;
 drop table if exists ttrss_filters2;
-drop table if exists ttrss_filters;
 drop table if exists ttrss_filter_types;
 drop table if exists ttrss_filter_actions;
 drop table if exists ttrss_user_prefs;
@@ -117,6 +116,7 @@ create table ttrss_feeds (id integer not null auto_increment primary key,
        hidden bool not null default false,
        include_in_digest boolean not null default true,
        cache_images boolean not null default false,
+       hide_images boolean not null default false,
        cache_content boolean not null default false,
        auth_pass_encrypted boolean not null default false,
        last_viewed datetime default null,
@@ -157,6 +157,7 @@ create table ttrss_entries (id integer not null primary key auto_increment,
        date_entered datetime not null,
        date_updated datetime not null,
        num_comments integer not null default 0,
+       plugin_data longtext,
        comments varchar(250) not null default '',
        author varchar(250) not null default '') ENGINE=InnoDB DEFAULT CHARSET=UTF8;
 
@@ -178,6 +179,8 @@ create table ttrss_user_entries (
        last_read datetime,
        score int not null default 0,
        note longtext,
+       last_marked datetime,
+       last_published datetime,
        unread bool not null default 1,
        index (ref_id),
        foreign key (ref_id) references ttrss_entries(id) ON DELETE CASCADE,
@@ -243,39 +246,18 @@ insert into ttrss_filter_actions (id,name,description) values (6, 'score',
 insert into ttrss_filter_actions (id,name,description) values (7, 'label',
        'Assign label');
 
-create table ttrss_filters (id integer not null primary key auto_increment,
-       owner_uid integer not null,
-       feed_id integer default null,
-       filter_type integer not null,
-       reg_exp varchar(250) not null,
-       filter_param varchar(250) not null default '',
-       inverse bool not null default false,
-       enabled bool not null default true,
-       cat_filter bool not null default false,
-       cat_id integer default null,
-       action_id integer not null default 1,
-       action_param varchar(250) not null default '',
-       index (filter_type),
-       foreign key (filter_type) references ttrss_filter_types(id) ON DELETE CASCADE,
-       index (owner_uid),
-       foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE,
-       index (feed_id),
-       foreign key (feed_id) references ttrss_feeds(id) ON DELETE CASCADE,
-       index (cat_id),
-       foreign key (cat_id) references ttrss_feed_categories(id) ON DELETE CASCADE,
-       index (action_id),
-       foreign key (action_id) references ttrss_filter_actions(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
-
 create table ttrss_filters2(id integer primary key auto_increment,
        owner_uid integer not null,
        match_any_rule boolean not null default false,
        enabled boolean not null default true,
+       inverse bool not null default false,
        index(owner_uid),
        foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
 
 create table ttrss_filters2_rules(id integer primary key auto_increment,
        filter_id integer not null references ttrss_filters2(id) on delete cascade,
        reg_exp varchar(250) not null,
+       inverse bool not null default false,
        filter_type integer not null,
        feed_id integer default null,
        cat_id integer default null,
@@ -309,7 +291,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 (101);
+insert into ttrss_version values (107);
 
 create table ttrss_enclosures (id integer primary key auto_increment,
        content_url text not null,
@@ -411,7 +393,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('VFEED_GROUP_BY_FEED', 1, 'false', 'Group headlines in virtual feeds',2, 'When this option is enabled, headlines in Special feeds and Labels are grouped by feeds');
 
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('STRIP_IMAGES', 1, 'false', 'Do not show images in articles', 2);
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('STRIP_IMAGES', 1, 'false', 'Do not embed images in articles', 2);
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_DEFAULT_VIEW_ORDER_BY', 2, 'default', '', 1);
 
@@ -455,6 +437,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_ENABLED_PLUGINS', 2, '', '', 1);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_REVERSE_HEADLINES', 1, 'false', '', 1);
+
 update ttrss_prefs set access_level = 1 where pref_name in ('ON_CATCHUP_SHOW_NEXT_FEED',
        'SORT_HEADLINES_BY_FEED_DATE',
        'VFEED_GROUP_BY_FEED',