initial schema work on linked instances and shared feedbrowser

This commit is contained in:
Andrew Dolgov 2011-04-20 11:40:41 +04:00
parent 1ca77e0acd
commit 58fa1bbc00
5 changed files with 148 additions and 92 deletions

View File

@ -2,7 +2,7 @@
require_once "functions.php"; require_once "functions.php";
define('EXPECTED_CONFIG_VERSION', 22); define('EXPECTED_CONFIG_VERSION', 22);
define('SCHEMA_VERSION', 83); define('SCHEMA_VERSION', 84);
if (!file_exists("config.php")) { if (!file_exists("config.php")) {
print "<b>Fatal Error</b>: You forgot to copy print "<b>Fatal Error</b>: You forgot to copy

View File

@ -1,6 +1,8 @@
SET NAMES utf8; SET NAMES utf8;
SET CHARACTER SET utf8; SET CHARACTER SET utf8;
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_access_keys;
drop table if exists ttrss_user_labels2; drop table if exists ttrss_user_labels2;
drop table if exists ttrss_labels2; drop table if exists ttrss_labels2;
@ -13,7 +15,7 @@ drop table if exists ttrss_filter_actions;
drop table if exists ttrss_user_prefs; drop table if exists ttrss_user_prefs;
drop table if exists ttrss_prefs; drop table if exists ttrss_prefs;
drop table if exists ttrss_prefs_types; drop table if exists ttrss_prefs_types;
drop table if exists ttrss_prefs_sections; drop table if exists ttrss_prefs_sections;
drop table if exists ttrss_tags; drop table if exists ttrss_tags;
drop table if exists ttrss_enclosures; drop table if exists ttrss_enclosures;
drop table if exists ttrss_settings_profiles; drop table if exists ttrss_settings_profiles;
@ -46,7 +48,7 @@ create table ttrss_users (id integer primary key not null auto_increment,
twitter_oauth longtext default null, twitter_oauth longtext default null,
index (theme_id)) TYPE=InnoDB DEFAULT CHARSET=UTF8; index (theme_id)) TYPE=InnoDB DEFAULT CHARSET=UTF8;
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); 'SHA1:5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8', 10);
create table ttrss_feed_categories(id integer not null primary key auto_increment, create table ttrss_feed_categories(id integer not null primary key auto_increment,
@ -59,8 +61,8 @@ create table ttrss_feed_categories(id integer not null primary key auto_incremen
create table ttrss_archived_feeds (id integer not null primary key, create table ttrss_archived_feeds (id integer not null primary key,
owner_uid integer not null, owner_uid integer not null,
title varchar(200) not null, title varchar(200) not null,
feed_url text not null, feed_url text not null,
site_url varchar(250) not null default '', site_url varchar(250) not null default '',
index(owner_uid), index(owner_uid),
foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) TYPE=InnoDB DEFAULT CHARSET=UTF8; foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) TYPE=InnoDB DEFAULT CHARSET=UTF8;
@ -89,9 +91,9 @@ create index ttrss_cat_counters_cache_owner_uid_idx on ttrss_cat_counters_cache(
create table ttrss_feeds (id integer not null auto_increment primary key, create table ttrss_feeds (id integer not null auto_increment primary key,
owner_uid integer not null, owner_uid integer not null,
title varchar(200) not null, title varchar(200) not null,
cat_id integer default null, cat_id integer default null,
feed_url text not null, feed_url text not null,
icon_url varchar(250) not null default '', icon_url varchar(250) not null default '',
update_interval integer not null default 0, update_interval integer not null default 0,
purge_interval integer not null default 0, purge_interval integer not null default 0,
@ -126,14 +128,14 @@ create table ttrss_feeds (id integer not null auto_increment primary key,
insert into ttrss_feeds (owner_uid, title, feed_url) values insert into ttrss_feeds (owner_uid, title, feed_url) values
(1, 'Tiny Tiny RSS: New Releases', 'http://tt-rss.org/releases.rss'); (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'); (1, 'Tiny Tiny RSS: Forum', 'http://tt-rss.org/forum/rss.php');
create table ttrss_entries (id integer not null primary key auto_increment, create table ttrss_entries (id integer not null primary key auto_increment,
title text not null, title text not null,
guid varchar(255) not null unique, guid varchar(255) not null unique,
link text not null, link text not null,
updated datetime not null, updated datetime not null,
content longtext not null, content longtext not null,
content_hash varchar(250) not null, content_hash varchar(250) not null,
no_orig_date bool not null default 0, no_orig_date bool not null default 0,
@ -150,8 +152,8 @@ create index ttrss_entries_updated_idx on ttrss_entries(updated);
create table ttrss_user_entries ( create table ttrss_user_entries (
int_id integer not null primary key auto_increment, int_id integer not null primary key auto_increment,
ref_id integer not null, ref_id integer not null,
feed_id int, feed_id int,
orig_feed_id int, orig_feed_id int,
owner_uid integer not null, owner_uid integer not null,
marked bool not null default 0, marked bool not null default 0,
published bool not null default 0, published bool not null default 0,
@ -182,48 +184,48 @@ create table ttrss_entry_comments (id integer not null primary key,
index (owner_uid), index (owner_uid),
foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) TYPE=InnoDB DEFAULT CHARSET=UTF8; foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) TYPE=InnoDB DEFAULT CHARSET=UTF8;
create table ttrss_filter_types (id integer primary key, create table ttrss_filter_types (id integer primary key,
name varchar(120) unique not null, name varchar(120) unique not null,
description varchar(250) not null unique) TYPE=InnoDB DEFAULT CHARSET=UTF8; description varchar(250) not null unique) TYPE=InnoDB DEFAULT CHARSET=UTF8;
insert into ttrss_filter_types (id,name,description) values (1, 'title', 'Title'); 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 (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'); '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'); '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'); 'Article Date');
insert into ttrss_filter_types (id,name,description) values (6, 'author', 'Author'); 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'); insert into ttrss_filter_types (id,name,description) values (7, 'tag', 'Article Tags');
create table ttrss_filter_actions (id integer not null primary key, create table ttrss_filter_actions (id integer not null primary key,
name varchar(120) unique not null, name varchar(120) unique not null,
description varchar(250) not null unique) TYPE=InnoDB DEFAULT CHARSET=UTF8; description varchar(250) not null unique) TYPE=InnoDB DEFAULT CHARSET=UTF8;
insert into ttrss_filter_actions (id,name,description) values (1, 'filter', insert into ttrss_filter_actions (id,name,description) values (1, 'filter',
'Delete article'); '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'); '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'); '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'); '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'); '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'); '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'); 'Assign label');
create table ttrss_filters (id integer not null primary key auto_increment, create table ttrss_filters (id integer not null primary key auto_increment,
owner_uid integer not null, owner_uid integer not null,
feed_id integer default null, feed_id integer default null,
filter_type integer not null, filter_type integer not null,
reg_exp varchar(250) not null, reg_exp varchar(250) not null,
@ -241,8 +243,8 @@ create table ttrss_filters (id integer not null primary key auto_increment,
index (action_id), index (action_id),
foreign key (action_id) references ttrss_filter_actions(id) ON DELETE CASCADE) TYPE=InnoDB DEFAULT CHARSET=UTF8; foreign key (action_id) references ttrss_filter_actions(id) ON DELETE CASCADE) TYPE=InnoDB DEFAULT CHARSET=UTF8;
create table ttrss_tags (id integer primary key auto_increment, create table ttrss_tags (id integer primary key auto_increment,
owner_uid integer not null, owner_uid integer not null,
tag_name varchar(250) not null, tag_name varchar(250) not null,
post_int_id integer not null, post_int_id integer not null,
index (post_int_id), index (post_int_id),
@ -252,7 +254,7 @@ create table ttrss_tags (id integer primary key auto_increment,
create table ttrss_version (schema_version int not null) TYPE=InnoDB DEFAULT CHARSET=UTF8; create table ttrss_version (schema_version int not null) TYPE=InnoDB DEFAULT CHARSET=UTF8;
insert into ttrss_version values (83); insert into ttrss_version values (84);
create table ttrss_enclosures (id integer primary key auto_increment, create table ttrss_enclosures (id integer primary key auto_increment,
content_url text not null, content_url text not null,
@ -269,14 +271,14 @@ create table ttrss_settings_profiles(id integer primary key auto_increment,
index (owner_uid), index (owner_uid),
foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) TYPE=InnoDB DEFAULT CHARSET=UTF8; foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) TYPE=InnoDB DEFAULT CHARSET=UTF8;
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) TYPE=InnoDB DEFAULT CHARSET=UTF8; type_name varchar(100) not null) TYPE=InnoDB DEFAULT CHARSET=UTF8;
insert into ttrss_prefs_types (id, type_name) values (1, 'bool'); 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 (2, 'string');
insert into ttrss_prefs_types (id, type_name) values (3, 'integer'); 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) TYPE=InnoDB DEFAULT CHARSET=UTF8; section_name varchar(100) not null) TYPE=InnoDB DEFAULT CHARSET=UTF8;
insert into ttrss_prefs_sections (id, section_name) values (1, 'General'); insert into ttrss_prefs_sections (id, section_name) values (1, 'General');
@ -394,25 +396,18 @@ create table ttrss_user_prefs (
index (pref_name), index (pref_name),
foreign key (pref_name) references ttrss_prefs(pref_name) ON DELETE CASCADE) TYPE=InnoDB DEFAULT CHARSET=UTF8; foreign key (pref_name) references ttrss_prefs(pref_name) ON DELETE CASCADE) TYPE=InnoDB DEFAULT CHARSET=UTF8;
create table ttrss_scheduled_updates (id integer not null primary key auto_increment,
owner_uid integer not null,
feed_id integer default null,
entered datetime not null,
foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE,
foreign key (feed_id) references ttrss_feeds(id) ON DELETE CASCADE) TYPE=InnoDB DEFAULT CHARSET=UTF8;
create table ttrss_sessions (id varchar(250) unique not null primary key, create table ttrss_sessions (id varchar(250) unique not null primary key,
data text, data text,
expire integer not null, expire integer not null,
index (id), index (id),
index (expire)) TYPE=InnoDB DEFAULT CHARSET=UTF8; index (expire)) TYPE=InnoDB DEFAULT CHARSET=UTF8;
create table ttrss_feedbrowser_cache ( create table ttrss_feedbrowser_cache (
feed_url text not null, feed_url text not null,
title text not null, title text not null,
subscribers integer not null) DEFAULT CHARSET=UTF8; subscribers integer not null) DEFAULT CHARSET=UTF8;
create table ttrss_labels2 (id integer not null primary key auto_increment, create table ttrss_labels2 (id integer not null primary key auto_increment,
owner_uid integer not null, owner_uid integer not null,
caption varchar(250) not null, caption varchar(250) not null,
fg_color varchar(15) not null default '', fg_color varchar(15) not null default '',
@ -426,11 +421,24 @@ create table ttrss_user_labels2 (label_id integer not null,
foreign key (article_id) references ttrss_entries(id) ON DELETE CASCADE foreign key (article_id) references ttrss_entries(id) ON DELETE CASCADE
) TYPE=InnoDB DEFAULT CHARSET=UTF8; ) TYPE=InnoDB DEFAULT CHARSET=UTF8;
create table ttrss_access_keys (id serial not null primary key, create table ttrss_access_keys (id integer not null primary key auto_increment,
access_key varchar(250) not null, access_key varchar(250) not null,
feed_id varchar(250) not null, feed_id varchar(250) not null,
is_cat bool not null default false, is_cat bool not null default false,
owner_uid integer not null, owner_uid integer not null,
foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) TYPE=InnoDB DEFAULT CHARSET=UTF8; foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) TYPE=InnoDB DEFAULT CHARSET=UTF8;
create table ttrss_linked_instances (id integer not null primary key auto_increment,
access_key varchar(250) not null,
access_url text not null) TYPE=InnoDB DEFAULT CHARSET=UTF8;
create table ttrss_linked_feeds (
feed_url text not null,
title text not null,
created datetime not null,
updated datetime not null,
instance_id integer not null,
subscribers integer not null,
foreign key (instance_id) references ttrss_linked_instances(id) ON DELETE CASCADE) TYPE=InnoDB DEFAULT CHARSET=UTF8;
commit; commit;

View File

@ -1,3 +1,5 @@
drop table ttrss_linked_feeds;
drop table ttrss_linked_instances;
drop table ttrss_access_keys; drop table ttrss_access_keys;
drop table ttrss_user_labels2; drop table ttrss_user_labels2;
drop table ttrss_labels2; drop table ttrss_labels2;
@ -10,7 +12,7 @@ drop table ttrss_filter_actions;
drop table ttrss_user_prefs; drop table ttrss_user_prefs;
drop table ttrss_prefs; drop table ttrss_prefs;
drop table ttrss_prefs_types; drop table ttrss_prefs_types;
drop table ttrss_prefs_sections; drop table ttrss_prefs_sections;
drop table ttrss_tags; drop table ttrss_tags;
drop table ttrss_enclosures; drop table ttrss_enclosures;
drop table ttrss_settings_profiles; drop table ttrss_settings_profiles;
@ -42,7 +44,7 @@ create table ttrss_users (id serial not null primary key,
twitter_oauth text default null, twitter_oauth text default null,
created timestamp 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); 'SHA1:5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8', 10);
create table ttrss_feed_categories(id serial not null primary key, create table ttrss_feed_categories(id serial not null primary key,
@ -53,9 +55,9 @@ create table ttrss_feed_categories(id serial not null primary key,
create table ttrss_feeds (id serial not null primary key, create table ttrss_feeds (id serial not null primary key,
owner_uid integer not null references ttrss_users(id) on delete cascade, 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, 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 '', icon_url varchar(250) not null default '',
update_interval integer not null default 0, update_interval integer not null default 0,
purge_interval integer not null default 0, purge_interval integer not null default 0,
@ -79,21 +81,21 @@ create table ttrss_feeds (id serial not null primary key,
update_on_checksum_change boolean not null default false, update_on_checksum_change boolean not null default false,
strip_images boolean not null default false, strip_images boolean not null default false,
pubsub_state integer not null default 0, pubsub_state integer not null default 0,
auth_pass_encrypted boolean not null default false); auth_pass_encrypted boolean not null default false);
create index ttrss_feeds_owner_uid_index on ttrss_feeds(owner_uid); create index ttrss_feeds_owner_uid_index on ttrss_feeds(owner_uid);
insert into ttrss_feeds (owner_uid, title, feed_url) values insert into ttrss_feeds (owner_uid, title, feed_url) values
(1, 'Tiny Tiny RSS: New Releases', 'http://tt-rss.org/releases.rss'); (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'); (1, 'Tiny Tiny RSS: Forum', 'http://tt-rss.org/forum/rss.php');
create table ttrss_archived_feeds (id integer not null primary key, create table ttrss_archived_feeds (id integer not null primary key,
owner_uid integer not null references ttrss_users(id) on delete cascade, owner_uid integer not null references ttrss_users(id) on delete cascade,
title varchar(200) not null, title varchar(200) not null,
feed_url text not null, feed_url text not null,
site_url varchar(250) not null default ''); site_url varchar(250) not null default '');
create table ttrss_counters_cache ( create table ttrss_counters_cache (
feed_id integer not null, feed_id integer not null,
@ -113,11 +115,11 @@ create table ttrss_cat_counters_cache (
create index ttrss_cat_counters_cache_owner_uid_idx on ttrss_cat_counters_cache(owner_uid); 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, create table ttrss_entries (id serial not null primary key,
title text not null, title text not null,
guid text not null unique, guid text not null unique,
link text not null, link text not null,
updated timestamp not null, updated timestamp not null,
content text not null, content text not null,
content_hash varchar(250) not null, content_hash varchar(250) not null,
no_orig_date boolean not null default false, no_orig_date boolean not null default false,
@ -135,8 +137,8 @@ create index ttrss_entries_updated_idx on ttrss_entries(updated);
create table ttrss_user_entries ( create table ttrss_user_entries (
int_id serial not null primary key, int_id serial not null primary key,
ref_id integer not null references ttrss_entries(id) ON DELETE CASCADE, ref_id integer not null references ttrss_entries(id) ON DELETE CASCADE,
feed_id int references ttrss_feeds(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, 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, owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
marked boolean not null default false, marked boolean not null default false,
published boolean not null default false, published boolean not null default false,
@ -158,54 +160,54 @@ create table ttrss_entry_comments (id serial not null primary key,
owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE, owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
private boolean not null default false, private boolean not null default false,
date_entered timestamp not null); date_entered timestamp not null);
create index ttrss_entry_comments_ref_id_index on ttrss_entry_comments(ref_id); 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 index ttrss_entry_comments_owner_uid_index on ttrss_entry_comments(owner_uid);
create table ttrss_filter_types (id integer not null primary key, create table ttrss_filter_types (id integer not null primary key,
name varchar(120) unique not null, name varchar(120) unique not null,
description varchar(250) not null unique); 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 (1, 'title', 'Title');
insert into ttrss_filter_types (id,name,description) values (2, 'content', 'Content'); 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'); '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'); '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'); 'Article Date');
insert into ttrss_filter_types (id,name,description) values (6, 'author', 'Author'); 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'); insert into ttrss_filter_types (id,name,description) values (7, 'tag', 'Article Tags');
create table ttrss_filter_actions (id integer not null primary key, create table ttrss_filter_actions (id integer not null primary key,
name varchar(120) unique not null, name varchar(120) unique not null,
description varchar(250) not null unique); 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'); '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'); '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'); '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'); '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'); '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'); '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'); '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, owner_uid integer not null references ttrss_users(id) on delete cascade,
feed_id integer references ttrss_feeds(id) on delete cascade default null, 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, reg_exp varchar(250) not null,
filter_param varchar(250) not null default '', filter_param varchar(250) not null default '',
enabled boolean not null default true, enabled boolean not null default true,
@ -213,7 +215,7 @@ 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_id integer not null default 1 references ttrss_filter_actions(id) on delete cascade,
action_param varchar(250) not null default ''); 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, tag_name varchar(250) not null,
owner_uid integer not null references ttrss_users(id) on delete cascade, 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); post_int_id integer references ttrss_user_entries(int_id) ON DELETE CASCADE not null);
@ -223,7 +225,7 @@ create index ttrss_tags_post_int_id_idx on ttrss_tags(post_int_id);
create table ttrss_version (schema_version int not null); create table ttrss_version (schema_version int not null);
insert into ttrss_version values (83); insert into ttrss_version values (84);
create table ttrss_enclosures (id serial not null primary key, create table ttrss_enclosures (id serial not null primary key,
content_url text not null, content_url text not null,
@ -236,14 +238,14 @@ create table ttrss_settings_profiles(id serial not null primary key,
title varchar(250) not null, title varchar(250) not null,
owner_uid integer not null references ttrss_users(id) on delete cascade); 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); 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 (1, 'bool');
insert into ttrss_prefs_types (id, type_name) values (2, 'string'); insert into ttrss_prefs_types (id, type_name) values (2, 'string');
insert into ttrss_prefs_types (id, type_name) values (3, 'integer'); 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); section_name varchar(100) not null);
insert into ttrss_prefs_sections (id, section_name) values (1, 'General'); insert into ttrss_prefs_sections (id, section_name) values (1, 'General');
@ -259,7 +261,7 @@ create table ttrss_prefs (pref_name varchar(250) not null primary key,
def_value text not null); def_value text not null);
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('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('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_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) values('DEFAULT_ARTICLE_LIMIT', 3, '30', 'Amount of articles to display at once',2);
@ -355,13 +357,8 @@ create table ttrss_user_prefs (
create index ttrss_user_prefs_owner_uid_index on ttrss_user_prefs(owner_uid); create index ttrss_user_prefs_owner_uid_index on ttrss_user_prefs(owner_uid);
-- create index ttrss_user_prefs_value_index on ttrss_user_prefs(value); -- 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, create table ttrss_sessions (id varchar(250) unique not null primary key,
data text, data text,
expire integer not null); expire integer not null);
create index ttrss_sessions_expire_index on ttrss_sessions(expire); create index ttrss_sessions_expire_index on ttrss_sessions(expire);
@ -371,9 +368,9 @@ create function SUBSTRING_FOR_DATE(timestamp, int, int) RETURNS text AS 'SELECT
create table ttrss_feedbrowser_cache ( create table ttrss_feedbrowser_cache (
feed_url text not null primary key, feed_url text not null primary key,
title text not null, title text not null,
subscribers integer 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, owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
fg_color varchar(15) not null default '', fg_color varchar(15) not null default '',
bg_color varchar(15) not null default '', bg_color varchar(15) not null default '',
@ -391,4 +388,16 @@ create table ttrss_access_keys (id serial not null primary key,
is_cat boolean not null default false, is_cat boolean not null default false,
owner_uid integer not null references ttrss_users(id) on delete cascade); owner_uid integer not null references ttrss_users(id) on delete cascade);
create table ttrss_linked_instances (id serial not null primary key,
access_key varchar(250) not null,
access_url text not null);
create table ttrss_linked_feeds (
feed_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; commit;

View File

@ -0,0 +1,20 @@
begin;
create table ttrss_linked_instances (id integer not null primary key auto_increment,
access_key varchar(250) not null,
access_url text not null) TYPE=InnoDB DEFAULT CHARSET=UTF8;
create table ttrss_linked_feeds (
feed_url text not null,
title text not null,
created datetime not null,
updated datetime not null,
instance_id integer not null,
subscribers integer not null,
foreign key (instance_id) references ttrss_linked_instances(id) ON DELETE CASCADE) TYPE=InnoDB DEFAULT CHARSET=UTF8;
drop table ttrss_scheduled_updates;
update ttrss_version set schema_version = 84;
commit;

View File

@ -0,0 +1,19 @@
begin;
create table ttrss_linked_instances (id serial not null primary key,
access_key varchar(250) not null,
access_url text not null);
create table ttrss_linked_feeds (
feed_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);
drop table ttrss_scheduled_updates;
update ttrss_version set schema_version = 84;
commit;