Merge remote-tracking branch 'upstream/master'

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

diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 778e2111a2ced97081abb963315931e5f246cc18..5063c4dd81a1c7f5ce893cf386a6abe7800e1c9b 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -1,3 +1,4 @@
+drop table if exists ttrss_plugin_storage;
 drop table if exists ttrss_linked_feeds;
 drop table if exists ttrss_linked_instances;
 drop table if exists ttrss_access_keys;
@@ -6,6 +7,9 @@ drop table if exists ttrss_labels2;
 drop table if exists ttrss_feedbrowser_cache;
 drop table if exists ttrss_version;
 drop table if exists ttrss_labels;
+drop table if exists ttrss_filters2_rules;
+drop table if exists ttrss_filters2_actions;
+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;
@@ -43,6 +47,7 @@ create table ttrss_users (id serial not null primary key,
        last_digest_sent timestamp default null,
        salt varchar(250) not null default '',
        twitter_oauth text default null,
+       otp_enabled boolean not null default false,
        created timestamp default null);
 
 insert into ttrss_users (login,pwd_hash,access_level) values ('admin',
@@ -74,6 +79,7 @@ create table ttrss_feeds (id serial not null primary key,
        include_in_digest boolean not null default true,
        rtl_content boolean not null default false,
        cache_images boolean not null default false,
+       cache_content boolean not null default false,
        last_viewed timestamp default null,
        last_update_started timestamp default null,
        update_method integer not null default 0,
@@ -126,11 +132,13 @@ create table ttrss_entries (id serial not null primary key,
        updated timestamp not null,
        content text not null,
        content_hash varchar(250) not null,
+       cached_content text,
        no_orig_date boolean not null default false,
        date_entered timestamp not null,
        date_updated timestamp not null,
        num_comments integer not null default 0,
        comments varchar(250) not null default '',
+       plugin_data text,
        author varchar(250) not null default '');
 
 create index ttrss_entries_guid_index on ttrss_entries(guid);
@@ -151,6 +159,8 @@ create table ttrss_user_entries (
        label_cache text not null,
        last_read timestamp,
        score int not null default 0,
+       last_marked timestamp,
+       last_published timestamp,
        note text,
        unread boolean not null default true);
 
@@ -222,6 +232,24 @@ create table ttrss_filters (id serial not null primary key,
        action_id integer not null default 1 references ttrss_filter_actions(id) on delete cascade,
        action_param varchar(250) not null default '');
 
+create table ttrss_filters2(id serial not null primary key,
+       owner_uid integer not null references ttrss_users(id) on delete cascade,
+       match_any_rule boolean not null default false,
+       enabled boolean not null default true);
+
+create table ttrss_filters2_rules(id serial not null primary key,
+       filter_id integer not null references ttrss_filters2(id) on delete cascade,
+       reg_exp varchar(250) not null,
+       filter_type integer not null references ttrss_filter_types(id),
+       feed_id integer references ttrss_feeds(id) on delete cascade default null,
+       cat_id integer references ttrss_feed_categories(id) on delete cascade default null,
+       cat_filter boolean not null default false);
+
+create table ttrss_filters2_actions(id serial not null primary key,
+       filter_id integer not null references ttrss_filters2(id) on delete cascade,
+       action_id integer not null default 1 references ttrss_filter_actions(id) on delete cascade,
+       action_param varchar(250) not null default '');
+
 create table ttrss_tags (id serial not null primary key,
        tag_name varchar(250) not null,
        owner_uid integer not null references ttrss_users(id) on delete cascade,
@@ -232,7 +260,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 (95);
+insert into ttrss_version values (105);
 
 create table ttrss_enclosures (id serial not null primary key,
        content_url text not null,
@@ -326,7 +354,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', 'Hide 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);
 
@@ -366,12 +394,19 @@ 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('_DEFAULT_INCLUDE_CHILDREN', 1, 'false', '', 1);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('AUTO_ASSIGN_LABELS', 1, 'true', 'Assign articles to labels automatically', 3);
+
+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',
        'FRESH_ARTICLE_MAX_AGE',
        'CDM_EXPANDED',
        'SHOW_CONTENT_PREVIEW',
+       'AUTO_ASSIGN_LABELS',
        'HIDE_READ_SHOWS_SPECIAL');
 
 create table ttrss_user_prefs (
@@ -432,4 +467,10 @@ create table ttrss_linked_feeds (
        instance_id integer not null references ttrss_linked_instances(id) ON DELETE CASCADE,
        subscribers integer not null);
 
+create table ttrss_plugin_storage (
+       id serial not null primary key,
+       name varchar(100) not null,
+       owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
+       content text not null);
+
 commit;