-drop table ttrss_access_keys;
-drop table ttrss_user_labels2;
-drop table ttrss_labels2;
-drop table ttrss_feedbrowser_cache;
-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_enclosures;
-drop table ttrss_settings_profiles;
-drop table ttrss_entry_comments;
-drop table ttrss_user_entries;
-drop table ttrss_entries;
-drop table ttrss_scheduled_updates;
-drop table ttrss_counters_cache;
-drop table ttrss_cat_counters_cache;
-drop table ttrss_archived_feeds;
-drop table ttrss_feeds;
-drop table ttrss_feed_categories;
-drop table ttrss_users;
-drop table ttrss_themes;
-drop table ttrss_sessions;
-drop function SUBSTRING_FOR_DATE(timestamp, int, int);
+drop table if exists ttrss_linked_feeds;
+drop table if exists ttrss_linked_instances;
+drop table if exists ttrss_access_keys;
+drop table if exists ttrss_user_labels2;
+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_filters;
+drop table if exists ttrss_filter_types;
+drop table if exists ttrss_filter_actions;
+drop table if exists ttrss_user_prefs;
+drop table if exists ttrss_prefs;
+drop table if exists ttrss_prefs_types;
+drop table if exists ttrss_prefs_sections;
+drop table if exists ttrss_tags;
+drop table if exists ttrss_enclosures;
+drop table if exists ttrss_settings_profiles;
+drop table if exists ttrss_entry_comments;
+drop table if exists ttrss_user_entries;
+drop table if exists ttrss_entries;
+drop table if exists ttrss_scheduled_updates;
+drop table if exists ttrss_counters_cache;
+drop table if exists ttrss_cat_counters_cache;
+drop table if exists ttrss_archived_feeds;
+drop table if exists ttrss_feeds;
+drop table if exists ttrss_feed_categories;
+drop table if exists ttrss_users;
+drop table if exists ttrss_themes;
+drop table if exists ttrss_sessions;
+drop function if exists SUBSTRING_FOR_DATE(timestamp, int, int);
begin;
-create table ttrss_themes(id serial not null primary key,
- theme_name varchar(200) not null,
- theme_path varchar(200) not null);
-
-insert into ttrss_themes (theme_name, theme_path) values ('Old-skool', 'compat');
-insert into ttrss_themes (theme_name, theme_path) values ('Graycube', 'graycube');
-insert into ttrss_themes (theme_name, theme_path) values ('Default (Compact)', 'compact');
-insert into ttrss_themes (theme_name, theme_path) values ('Three-pane', '3pane');
-
create table ttrss_users (id serial not null primary key,
login varchar(120) not null unique,
pwd_hash varchar(250) not null,
full_name varchar(250) not null default '',
email_digest boolean not null default false,
last_digest_sent timestamp default null,
+ salt varchar(250) not null default '',
twitter_oauth text default null,
- created timestamp default null,
- theme_id integer references ttrss_themes(id) default null);
+ created timestamp default null);
-insert into ttrss_users (login,pwd_hash,access_level) values ('admin',
+insert into ttrss_users (login,pwd_hash,access_level) values ('admin',
'SHA1:5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8', 10);
create table ttrss_feed_categories(id serial not null primary key,
owner_uid integer not null references ttrss_users(id) on delete cascade,
collapsed boolean not null default false,
order_id integer not null default 0,
+ parent_cat integer references ttrss_feed_categories(id) on delete set null,
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,
+ title varchar(200) not null,
cat_id integer default null references ttrss_feed_categories(id) on delete set null,
- feed_url text not null,
+ feed_url text not null,
icon_url varchar(250) not null default '',
update_interval integer not null default 0,
purge_interval integer not null default 0,
update_method integer not null default 0,
always_display_enclosures boolean not null default false,
order_id integer not null default 0,
- auth_pass_encrypted boolean not null default false);
+ mark_unread_on_update boolean not null default false,
+ update_on_checksum_change boolean not null default false,
+ strip_images boolean not null default false,
+ pubsub_state integer not null default 0,
+ favicon_last_checked timestamp default null,
+ auth_pass_encrypted boolean not null default false);
create index ttrss_feeds_owner_uid_index on ttrss_feeds(owner_uid);
+create index ttrss_feeds_cat_id_idx on ttrss_feeds(cat_id);
insert into ttrss_feeds (owner_uid, title, feed_url) values
(1, 'Tiny Tiny RSS: New Releases', 'http://tt-rss.org/releases.rss');
-insert into ttrss_feeds (owner_uid, title, feed_url) values
+insert into ttrss_feeds (owner_uid, title, feed_url) values
(1, 'Tiny Tiny RSS: Forum', 'http://tt-rss.org/forum/rss.php');
create table ttrss_archived_feeds (id integer not null primary key,
owner_uid integer not null references ttrss_users(id) on delete cascade,
- title varchar(200) not null,
- feed_url text not null,
- site_url varchar(250) not null default '');
+ title varchar(200) not null,
+ feed_url text not null,
+ site_url varchar(250) not null default '');
create table ttrss_counters_cache (
feed_id integer not null,
create index ttrss_cat_counters_cache_owner_uid_idx on ttrss_cat_counters_cache(owner_uid);
-create table ttrss_entries (id serial not null primary key,
- title text not null,
- guid text not null unique,
- link text not null,
- updated timestamp not null,
+create table ttrss_entries (id serial not null primary key,
+ title text not null,
+ guid text not null unique,
+ link text not null,
+ updated timestamp not null,
content text not null,
content_hash varchar(250) not null,
no_orig_date boolean not null default false,
create table ttrss_user_entries (
int_id serial not null primary key,
ref_id integer not null references ttrss_entries(id) ON DELETE CASCADE,
- feed_id int references ttrss_feeds(id) ON DELETE CASCADE,
- orig_feed_id integer references ttrss_archived_feeds(id) ON DELETE SET NULL,
+ uuid varchar(200) not null,
+ feed_id int references ttrss_feeds(id) ON DELETE CASCADE,
+ orig_feed_id integer references ttrss_archived_feeds(id) ON DELETE SET NULL,
owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
marked boolean not null default false,
published boolean not null default false,
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,
+create table ttrss_filter_types (id integer not null primary key,
+ name varchar(120) unique not null,
description varchar(250) not null unique);
insert into ttrss_filter_types (id,name,description) values (1, 'title', 'Title');
insert into ttrss_filter_types (id,name,description) values (2, 'content', 'Content');
-insert into ttrss_filter_types (id,name,description) values (3, 'both',
+insert into ttrss_filter_types (id,name,description) values (3, 'both',
'Title or Content');
-insert into ttrss_filter_types (id,name,description) values (4, 'link',
+insert into ttrss_filter_types (id,name,description) values (4, 'link',
'Link');
-insert into ttrss_filter_types (id,name,description) values (5, 'date',
+insert into ttrss_filter_types (id,name,description) values (5, 'date',
'Article Date');
insert into ttrss_filter_types (id,name,description) values (6, 'author', 'Author');
insert into ttrss_filter_types (id,name,description) values (7, 'tag', 'Article Tags');
-create table ttrss_filter_actions (id integer not null primary key,
- name varchar(120) unique not null,
+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',
+insert into ttrss_filter_actions (id,name,description) values (1, 'filter',
'Delete article');
-insert into ttrss_filter_actions (id,name,description) values (2, 'catchup',
+insert into ttrss_filter_actions (id,name,description) values (2, 'catchup',
'Mark as read');
-insert into ttrss_filter_actions (id,name,description) values (3, 'mark',
+insert into ttrss_filter_actions (id,name,description) values (3, 'mark',
'Set starred');
-insert into ttrss_filter_actions (id,name,description) values (4, 'tag',
+insert into ttrss_filter_actions (id,name,description) values (4, 'tag',
'Assign tags');
-insert into ttrss_filter_actions (id,name,description) values (5, 'publish',
+insert into ttrss_filter_actions (id,name,description) values (5, 'publish',
'Publish article');
-insert into ttrss_filter_actions (id,name,description) values (6, 'score',
+insert into ttrss_filter_actions (id,name,description) values (6, 'score',
'Modify score');
-insert into ttrss_filter_actions (id,name,description) values (7, 'label',
+insert into ttrss_filter_actions (id,name,description) values (7, 'label',
'Assign label');
-create table ttrss_filters (id serial not null primary key,
+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),
+ filter_type integer not null references ttrss_filter_types(id),
reg_exp varchar(250) not null,
filter_param varchar(250) not null default '',
enabled boolean not null default true,
inverse boolean not null default false,
+ cat_filter boolean not null default false,
+ cat_id integer references ttrss_feed_categories(id) on delete cascade default null,
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,
+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,
post_int_id integer references ttrss_user_entries(int_id) ON DELETE CASCADE not null);
create table ttrss_version (schema_version int not null);
-insert into ttrss_version values (82);
+insert into ttrss_version values (93);
create table ttrss_enclosures (id serial not null primary key,
content_url text not null,
duration text not null,
post_id integer references ttrss_entries(id) ON DELETE cascade NOT NULL);
+create index ttrss_enclosures_post_id_idx on ttrss_enclosures(post_id);
+
create table ttrss_settings_profiles(id serial not null primary key,
title varchar(250) not null,
owner_uid integer not null references ttrss_users(id) on delete cascade);
-create table ttrss_prefs_types (id integer not null primary key,
+create table ttrss_prefs_types (id integer not null primary key,
type_name varchar(100) not null);
insert into ttrss_prefs_types (id, type_name) values (1, 'bool');
insert into ttrss_prefs_types (id, type_name) values (2, 'string');
insert into ttrss_prefs_types (id, type_name) values (3, 'integer');
-create table ttrss_prefs_sections (id integer not null primary key,
+create table ttrss_prefs_sections (id integer not null primary key,
section_name varchar(100) not null);
insert into ttrss_prefs_sections (id, section_name) values (1, 'General');
access_level integer not null default 0,
def_value text not null);
+create index ttrss_prefs_pref_name_idx on ttrss_prefs(pref_name);
+
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('PURGE_OLD_DAYS', 3, '60', 'Purge old posts after this number of days (0 - disables)',1);
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('UPDATE_POST_ON_CHECKSUM_CHANGE', 1, 'true', 'Update post on checksum change',1);
-
+
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('DEFAULT_UPDATE_INTERVAL', 3, '30', 'Default interval between feed updates',1);
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('DEFAULT_ARTICLE_LIMIT', 3, '30', 'Amount of articles to display at once',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) 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('ENABLE_FEED_CATS', 1, 'true', '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('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,help_text) values('COMBINED_DISPLAY_MODE', 1, 'false', 'Combined feed display',2, 'Display expanded list of feed articles, instead of separate displays for headlines and article content');
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('HIDE_READ_FEEDS', 1, 'false', 'Hide feeds with no unread messages',2);
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ON_CATCHUP_SHOW_NEXT_FEED', 1, 'false', 'On catchup show next feed',2, 'When "Mark as read" button is clicked in toolbar, automatically open next feed with unread articles.');
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ON_CATCHUP_SHOW_NEXT_FEED', 1, 'false', 'On catchup show next feed',2, 'Automatically open next feed with unread articles after marking one as read');
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('FEEDS_SORT_BY_UNREAD', 1, 'false', 'Sort feeds by unread articles count',2);
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('MARK_UNREAD_ON_UPDATE', 1, 'false', 'Set articles as unread on update',3);
-
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('REVERSE_HEADLINES', 1, 'false', 'Reverse headline order (oldest first)',2);
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('DIGEST_ENABLE', 1, 'false', 'Enable e-mail digest',1, 'This option enables sending daily digest of new (and unread) headlines on your configured e-mail address');
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_BROWSE_CATS', 1, 'true', '', 1);
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('SSL_CERT_SERIAL', 2, '', 'Login with an SSL certificate',3, 'You can login automatically with an active client SSL certificate if you fill in its serial number here.');
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('SSL_CERT_SERIAL', 2, '', 'Login with an SSL certificate',3, 'Click to register your SSL client certificate with tt-rss');
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('DIGEST_PREFERRED_TIME', 2, '00:00', 'Try to send digests around specified time', 1, 'Uses UTC timezone');
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_SHOW_EMPTY_CATS', 1, 'false', '', 1);
create table ttrss_user_prefs (
owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
value text not null);
create index ttrss_user_prefs_owner_uid_index on ttrss_user_prefs(owner_uid);
+create index ttrss_user_prefs_pref_name_idx on ttrss_user_prefs(pref_name);
-- create index ttrss_user_prefs_value_index on ttrss_user_prefs(value);
-create table ttrss_scheduled_updates (id serial not null primary key,
- owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
- feed_id integer default null references ttrss_feeds(id) ON DELETE CASCADE,
- entered timestamp not null default NOW());
-
create table ttrss_sessions (id varchar(250) unique not null primary key,
- data text,
+ data text,
expire integer not null);
create index ttrss_sessions_expire_index on ttrss_sessions(expire);
create table ttrss_feedbrowser_cache (
feed_url text not null primary key,
title text not null,
- subscribers integer not null);
+ site_url text not null,
+ subscribers integer not null);
-create table ttrss_labels2 (id serial not null primary key,
+create table ttrss_labels2 (id serial not null primary key,
owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
fg_color varchar(15) not null default '',
bg_color varchar(15) not null default '',
is_cat boolean not null default false,
owner_uid integer not null references ttrss_users(id) on delete cascade);
+create table ttrss_linked_instances (id serial not null primary key,
+ last_connected timestamp not null,
+ last_status_in integer not null,
+ last_status_out integer not null,
+ access_key varchar(250) not null unique,
+ access_url text not null);
+
+create table ttrss_linked_feeds (
+ feed_url text not null,
+ site_url text not null,
+ title text not null,
+ created timestamp not null,
+ updated timestamp not null,
+ instance_id integer not null references ttrss_linked_instances(id) ON DELETE CASCADE,
+ subscribers integer not null);
+
commit;
git.wh0rd.org / tt-rss.git / blobdiff