X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=schema%2Fttrss_schema_mysql.sql;h=a1b45efbbddca58a966c100dc4d5317bc7568c44;hb=e52034b4bcce994312ce2af31be0a46a70172691;hp=3773d9a4538bec49399a3181e883bc8ee0fe5856;hpb=14118af36f2ba65a4e5151ee33b6ad565492cbf0;p=tt-rss.git diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 3773d9a4..a1b45efb 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -1,6 +1,7 @@ SET NAMES utf8; SET CHARACTER SET utf8; +drop table if exists ttrss_error_log; drop table if exists ttrss_plugin_storage; drop table if exists ttrss_linked_feeds; drop table if exists ttrss_linked_instances; @@ -13,6 +14,7 @@ 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; @@ -42,7 +44,6 @@ create table ttrss_users (id integer primary key not null auto_increment, pwd_hash varchar(250) not null, last_login datetime default null, access_level integer not null default 0, - theme_id integer default null, email varchar(250) not null default '', full_name varchar(250) not null default '', email_digest bool not null default false, @@ -51,7 +52,7 @@ create table ttrss_users (id integer primary key not null auto_increment, created datetime default null, twitter_oauth longtext default null, otp_enabled boolean not null default false, - index (theme_id)) ENGINE=InnoDB DEFAULT CHARSET=UTF8; + resetpass_token varchar(250) default null) ENGINE=InnoDB DEFAULT CHARSET=UTF8; insert into ttrss_users (login,pwd_hash,access_level) values ('admin', 'SHA1:5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8', 10); @@ -63,9 +64,7 @@ create table ttrss_feed_categories(id integer not null primary key auto_incremen order_id integer not null default 0, parent_cat integer, view_settings varchar(250) not null default '', - index(parent_cat), foreign key (parent_cat) references ttrss_feed_categories(id) ON DELETE SET NULL, - index(owner_uid), foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8; create table ttrss_archived_feeds (id integer not null primary key, @@ -73,7 +72,6 @@ create table ttrss_archived_feeds (id integer not null primary key, title varchar(200) not null, feed_url text not null, site_url varchar(250) not null default '', - index(owner_uid), foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8; create table ttrss_counters_cache ( @@ -82,10 +80,9 @@ create table ttrss_counters_cache ( value integer not null default 0, updated datetime not null, foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE -); +) ENGINE=InnoDB DEFAULT CHARSET=UTF8; create index ttrss_counters_cache_feed_id_idx on ttrss_counters_cache(feed_id); -create index ttrss_counters_cache_owner_uid_idx on ttrss_counters_cache(owner_uid); create index ttrss_counters_cache_value_idx on ttrss_counters_cache(value); create table ttrss_cat_counters_cache ( @@ -94,9 +91,7 @@ create table ttrss_cat_counters_cache ( value integer not null default 0, updated datetime not null, foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE -); - -create index ttrss_cat_counters_cache_owner_uid_idx on ttrss_cat_counters_cache(owner_uid); +) ENGINE=InnoDB DEFAULT CHARSET=UTF8; create table ttrss_feeds (id integer not null auto_increment primary key, owner_uid integer not null, @@ -106,8 +101,10 @@ create table ttrss_feeds (id integer not null auto_increment primary key, icon_url varchar(250) not null default '', update_interval integer not null default 0, purge_interval integer not null default 0, - last_updated datetime default 0, + last_updated datetime default null, + last_unconditional datetime default null, last_error varchar(250) not null default '', + last_modified varchar(250) not null default '', favicon_avg_color varchar(11) default null, site_url varchar(250) not null default '', auth_login varchar(250) not null default '', @@ -132,19 +129,11 @@ create table ttrss_feeds (id integer not null auto_increment primary key, view_settings varchar(250) not null default '', pubsub_state integer not null default 0, favicon_last_checked datetime default null, - index(owner_uid), + feed_language varchar(100) not null default '', foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE, - index(cat_id), foreign key (cat_id) references ttrss_feed_categories(id) ON DELETE SET NULL, - index(parent_feed), foreign key (parent_feed) references ttrss_feeds(id) ON DELETE SET NULL) ENGINE=InnoDB DEFAULT CHARSET=UTF8; -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 (1, 'Tiny Tiny RSS: Forum', 'http://tt-rss.org/forum/rss.php'); @@ -161,11 +150,11 @@ create table ttrss_entries (id integer not null primary key auto_increment, date_updated datetime not null, num_comments integer not null default 0, plugin_data longtext, + lang varchar(2), comments varchar(250) not null default '', author varchar(250) not null default '') ENGINE=InnoDB DEFAULT CHARSET=UTF8; create index ttrss_entries_date_entered_index on ttrss_entries(date_entered); -create index ttrss_entries_guid_index on ttrss_entries(guid); create index ttrss_entries_updated_idx on ttrss_entries(updated); create table ttrss_user_entries ( @@ -185,18 +174,11 @@ create table ttrss_user_entries ( 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, - index (feed_id), foreign key (feed_id) references ttrss_feeds(id) ON DELETE CASCADE, - index (orig_feed_id), foreign key (orig_feed_id) references ttrss_archived_feeds(id) ON DELETE SET NULL, - index (owner_uid), foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8; -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); -create index ttrss_user_entries_feed_id on ttrss_user_entries(feed_id); create index ttrss_user_entries_unread_idx on ttrss_user_entries(unread); create table ttrss_entry_comments (id integer not null primary key, @@ -252,6 +234,9 @@ insert into ttrss_filter_actions (id,name,description) values (7, 'label', insert into ttrss_filter_actions (id,name,description) values (8, 'stop', 'Stop / Do nothing'); +insert into ttrss_filter_actions (id,name,description) values (9, 'plugin', + 'Invoke plugin'); + create table ttrss_filters2(id integer primary key auto_increment, owner_uid integer not null, match_any_rule boolean not null default false, @@ -259,17 +244,17 @@ create table ttrss_filters2(id integer primary key auto_increment, inverse bool not null default false, title varchar(250) not null default '', order_id integer not null default 0, - 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, + reg_exp text not null, inverse bool not null default false, filter_type integer not null, feed_id integer default null, cat_id integer default null, cat_filter boolean not null default false, + match_on text, index (filter_id), foreign key (filter_id) references ttrss_filters2(id) on delete cascade, index (filter_type), @@ -299,7 +284,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 (117); +insert into ttrss_version values (134); create table ttrss_enclosures (id integer primary key auto_increment, content_url text not null, @@ -307,11 +292,10 @@ create table ttrss_enclosures (id integer primary key auto_increment, post_id integer not null, title text not null, duration text not null, - index (post_id), + width integer not null default 0, + height integer not null default 0, foreign key (post_id) references ttrss_entries(id) ON DELETE cascade) ENGINE=InnoDB DEFAULT CHARSET=UTF8; -create index ttrss_enclosures_post_id_idx on ttrss_enclosures(post_id); - create table ttrss_settings_profiles(id integer primary key auto_increment, title varchar(250) not null, owner_uid integer not null, @@ -338,13 +322,9 @@ create table ttrss_prefs (pref_name varchar(250) not null primary key, section_id integer not null default 1, access_level integer not null default 0, def_value text not null, - index(type_id), foreign key (type_id) references ttrss_prefs_types(id), - index(section_id), foreign key (section_id) references ttrss_prefs_sections(id)) ENGINE=InnoDB DEFAULT CHARSET=UTF8; -create index ttrss_prefs_pref_name_idx on ttrss_prefs(pref_name); - insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('PURGE_OLD_DAYS', 3, '60', 1); insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('DEFAULT_UPDATE_INTERVAL', 3, '30', 1); insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('DEFAULT_ARTICLE_LIMIT', 3, '30', 2); @@ -384,7 +364,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_MOBILE insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_MOBILE_HIDE_READ', 1, 'false', 1); insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_MOBILE_SORT_FEEDS_UNREAD', 1, 'false', 1); insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_THEME_ID', 2, '0', 1); -insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_TIMEZONE', 2, 'UTC', 1); +insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_TIMEZONE', 2, 'Automatic', 1); insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_STYLESHEET', 2, '', 2); insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('SORT_HEADLINES_BY_FEED_DATE', 1, 'false', 2); insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_MOBILE_BROWSE_CATS', 1, 'true', 1); @@ -392,10 +372,11 @@ insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('SSL_CER insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('DIGEST_PREFERRED_TIME', 2, '00:00', 4); insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_PREFS_SHOW_EMPTY_CATS', 1, 'false', 1); insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_DEFAULT_INCLUDE_CHILDREN', 1, 'false', 1); -insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('AUTO_ASSIGN_LABELS', 1, 'true', 3); +insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('AUTO_ASSIGN_LABELS', 1, 'false', 3); insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_ENABLED_PLUGINS', 2, '', 1); insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_MOBILE_REVERSE_HEADLINES', 1, 'false', 1); insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_CSS_THEME', 2, '', 2); +insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_LANGUAGE', 2, '', 2); update ttrss_prefs set access_level = 1 where pref_name in ('ON_CATCHUP_SHOW_NEXT_FEED', 'SORT_HEADLINES_BY_FEED_DATE', @@ -413,25 +394,19 @@ create table ttrss_user_prefs ( profile integer, index (profile), foreign key (profile) references ttrss_settings_profiles(id) ON DELETE CASCADE, - index (owner_uid), foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE, - index (pref_name), foreign key (pref_name) references ttrss_prefs(pref_name) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8; -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 table ttrss_sessions (id varchar(250) unique not null primary key, +create table ttrss_sessions (id varchar(250) not null primary key, data text, expire integer not null, - index (id), index (expire)) ENGINE=InnoDB DEFAULT CHARSET=UTF8; create table ttrss_feedbrowser_cache ( feed_url text not null, site_url text not null, title text not null, - subscribers integer not null) DEFAULT CHARSET=UTF8; + subscribers integer not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8; create table ttrss_labels2 (id integer not null primary key auto_increment, owner_uid integer not null, @@ -478,5 +453,15 @@ create table ttrss_plugin_storage ( content longtext not null, foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8; +create table ttrss_error_log( + id integer not null auto_increment primary key, + owner_uid integer, + errno integer not null, + errstr text not null, + filename text not null, + lineno integer not null, + context text not null, + created_at datetime not null, + foreign key (owner_uid) references ttrss_users(id) ON DELETE SET NULL) ENGINE=InnoDB DEFAULT CHARSET=UTF8; commit;