combined article display mode (option COMBINED_DISPLAY_MODE), remove xml feed output

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

diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index f7461d90266ba71ed3faae70f515351f949482e5..758c6f664ef0fd4e84af0df361462d6fe4479c02 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -1,26 +1,42 @@
+drop table ttrss_version;
+drop table ttrss_labels;
+drop table ttrss_filters;
+drop table ttrss_filter_types;
+drop table ttrss_filter_actions;
+drop table ttrss_user_prefs;
+drop table ttrss_prefs;
+drop table ttrss_prefs_types;
+drop table ttrss_prefs_sections; 
 drop table ttrss_tags;
-
+drop table ttrss_entry_comments;
 drop table ttrss_user_entries;
 drop table ttrss_entries;
-
 drop table ttrss_feeds;
-drop table ttrss_labels;
-drop table ttrss_filters;
-
-drop table ttrss_user_prefs;
+drop table ttrss_feed_categories;
 drop table ttrss_users;
+drop table ttrss_themes;
+
+create table ttrss_themes(id serial not null primary key,
+       theme_name varchar(200) not null,
+       theme_path varchar(200) not null);
 
 create table ttrss_users (id serial not null primary key,
        login varchar(120) not null unique,
        pwd_hash varchar(250) not null,
        last_login timestamp default null,
-       access_level integer not null default 0);
+       access_level integer not null default 0,
+       theme_id integer references ttrss_themes(id) default null);
 
 insert into ttrss_users (login,pwd_hash,access_level) values ('admin', 'password', 10);
 
+create table ttrss_feed_categories(id serial not null primary key,
+       owner_uid integer not null references ttrss_users(id) on delete cascade,
+       title varchar(200) not null);
+
 create table ttrss_feeds (id serial not null primary key,
        owner_uid integer not null references ttrss_users(id) on delete cascade,
        title varchar(200) not null, 
+       cat_id integer references ttrss_feed_categories(id) default null,
        feed_url varchar(250) not null, 
        icon_url varchar(250) not null default '',
        update_interval integer not null default 0,
@@ -49,6 +65,7 @@ create table ttrss_entries (id serial not null primary key,
        content_hash varchar(250) not null,
        no_orig_date boolean not null default false,
        date_entered timestamp not null default NOW(),
+       num_comments integer not null default 0,
        comments varchar(250) not null default '');
 
 create index ttrss_entries_guid_index on ttrss_entries(guid);
@@ -67,8 +84,14 @@ create index ttrss_user_entries_feed_id_index on ttrss_user_entries(feed_id);
 create index ttrss_user_entries_owner_uid_index on ttrss_user_entries(owner_uid);
 create index ttrss_user_entries_ref_id_index on ttrss_user_entries(ref_id);
 
-drop table ttrss_filters;
-drop table ttrss_filter_types;
+create table ttrss_entry_comments (id serial not null primary key,
+       ref_id integer not null references ttrss_entries(id) ON DELETE CASCADE,
+       owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
+       private boolean not null default false,
+       date_entered timestamp not null);
+       
+create index ttrss_entry_comments_ref_id_index on ttrss_entry_comments(ref_id);
+create index ttrss_entry_comments_owner_uid_index on ttrss_entry_comments(owner_uid);
 
 create table ttrss_filter_types (id integer not null primary key, 
        name varchar(120) unique not null, 
@@ -81,13 +104,23 @@ insert into ttrss_filter_types (id,name,description) values (3, 'both',
 insert into ttrss_filter_types (id,name,description) values (4, 'link', 
        'Link');
 
-create table ttrss_filters (id serial not null primary key, 
+create table ttrss_filter_actions (id integer not null primary key, 
+       name varchar(120) unique not null, 
+       description varchar(250) not null unique);
+
+insert into ttrss_filter_actions (id,name,description) values (1, 'filter', 
+       'Filter article');
+
+insert into ttrss_filter_actions (id,name,description) values (2, 'catchup', 
+       'Mark as read');
+
+create table ttrss_filters (id serial not null primary key,    
        owner_uid integer not null references ttrss_users(id) on delete cascade,
+       feed_id integer references ttrss_feeds(id) on delete cascade default null,
        filter_type integer not null references ttrss_filter_types(id), 
        reg_exp varchar(250) not null,
-       description varchar(250) not null default '');
-
-drop table ttrss_labels;
+       description varchar(250) not null default '',
+       action_id integer not null default 1 references ttrss_filter_actions(id) on delete cascade);
 
 create table ttrss_labels (id serial not null primary key, 
        owner_uid integer not null references ttrss_users(id) on delete cascade,
@@ -109,16 +142,10 @@ create table ttrss_tags (id serial not null primary key,
 
 create index ttrss_tags_owner_uid_index on ttrss_tags(owner_uid);
 
-drop table ttrss_version;
-
 create table ttrss_version (schema_version int not null);
 
 insert into ttrss_version values (2);
 
-drop table ttrss_prefs;
-drop table ttrss_prefs_types;
-drop table ttrss_prefs_sections;
-
 create table ttrss_prefs_types (id integer not null primary key, 
        type_name varchar(100) not null);
 
@@ -154,21 +181,30 @@ 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('DEFAULT_ARTICLE_LIMIT', 3, '0', 'Default article limit',2,
        'Default limit for articles to display, any custom number you like (0 - disables).');
        
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('DAEMON_REFRESH_ONLY', 1, 'false', 'Daemon refresh only', 3,
-       'Updates to all feeds will only run when the backend script is invoked with a "daemon" option on the URI stem.');
-
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('DISPLAY_FEEDLIST_ACTIONS', 1, 'false', 'Display feedlist actions',2,
        'Display separate dropbox for feedlist actions, if disabled these actions are available in global actions menu.');
 
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_SPLASH', 1, 'false', 'Enable loading splashscreen',2);
-
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ALLOW_DUPLICATE_POSTS', 1, 'true', 'Allow duplicate posts',1,
        'This option is useful when you are reading several planet-type aggregators with partially colliding userbase. 
        When disabled, it forces same posts from different feeds to appear only once.');
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('USER_STYLESHEET_URL', 2, '', 'User stylesheet URL',2,
+       'Link to user stylesheet to override default style, disabled if empty.');
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_FEED_CATS', 1, 'false', 'Enable feed categories',2);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('SHOW_CONTENT_PREVIEW', 1, 'true', 'Show content preview in headlines list',2);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('SHORT_DATE_FORMAT', 2, 'M d, G:i', 'Short date format',3);
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('LONG_DATE_FORMAT', 2, 'D, M d Y - G:i', 'Long date format',3);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('HEADLINES_SMART_DATE', 1, 'true', 'Use more accessible date/time format for headlines',3);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('COMBINED_DISPLAY_MODE', 1, 'false', 'Combined feed display, no headline/article separation',2);
+
 create table ttrss_user_prefs (
-       owner_uid integer not null references ttrss_users(id) on delete cascade,
-       pref_name varchar(250) not null references ttrss_prefs(pref_name),
+       owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
+       pref_name varchar(250) not null references ttrss_prefs(pref_name) ON DELETE CASCADE,
        value text not null);
 
 create index ttrss_user_prefs_owner_uid_index on ttrss_user_prefs(owner_uid);