diff --git a/config.php-dist b/config.php-dist index 1cabc5a07..6ddd22405 100644 --- a/config.php-dist +++ b/config.php-dist @@ -87,9 +87,8 @@ define('ENABLE_TRANSLATIONS', true); // Enable support for interface translations - define('MYSQL_CHARSET', ''); - // Connection charset for MySQL. Only enable if having charset-related - // errors with MySQL (mangled characters, errors when updating feeds, etc). + define('MYSQL_CHARSET', 'UTF8'); + // Connection charset for MySQL. define('DEFAULT_UPDATE_METHOD', 0); // Which feed parsing library to use as default: diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 40986e005..37c32dba8 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -33,7 +33,7 @@ begin; create table ttrss_themes(id integer not null primary key auto_increment, theme_name varchar(200) not null, - theme_path varchar(200) not null) TYPE=InnoDB DEFAULT CHARSET=UTF8;; + theme_path varchar(200) not null) TYPE=InnoDB DEFAULT CHARSET=UTF8; insert into ttrss_themes (theme_name, theme_path) values ('Old-skool', 'compat'); insert into ttrss_themes (theme_name, theme_path) values ('Graycube', 'graycube'); @@ -51,7 +51,7 @@ create table ttrss_users (id integer primary key not null auto_increment, last_digest_sent datetime default null, created datetime default null, index (theme_id), - foreign key (theme_id) references ttrss_themes(id)) TYPE=InnoDB DEFAULT CHARSET=UTF8;; + foreign key (theme_id) references ttrss_themes(id)) TYPE=InnoDB DEFAULT CHARSET=UTF8; insert into ttrss_users (login,pwd_hash,access_level) values ('admin', 'SHA1:5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8', 10); @@ -62,7 +62,7 @@ create table ttrss_feed_categories(id integer not null primary key auto_incremen collapsed bool not null default false, order_id integer not null default 0, 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_archived_feeds (id integer not null primary key, owner_uid integer not null, @@ -70,7 +70,7 @@ create table ttrss_archived_feeds (id integer not null primary key, 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) TYPE=InnoDB DEFAULT CHARSET=UTF8;; + foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) TYPE=InnoDB DEFAULT CHARSET=UTF8; create table ttrss_counters_cache ( feed_id integer not null, @@ -117,7 +117,7 @@ create table ttrss_feeds (id integer not null auto_increment primary key, 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) TYPE=InnoDB DEFAULT CHARSET=UTF8;; + foreign key (parent_feed) references ttrss_feeds(id) ON DELETE SET NULL) TYPE=InnoDB DEFAULT CHARSET=UTF8; insert into ttrss_feeds (owner_uid, title, feed_url) values (1, 'Tiny Tiny RSS: New Releases', 'http://tt-rss.org/releases.rss'); @@ -130,14 +130,14 @@ create table ttrss_entries (id integer not null primary key auto_increment, guid varchar(255) not null unique, link text not null, updated datetime not null, - content text not null, + content longtext not null, content_hash varchar(250) not null, no_orig_date bool not null default 0, date_entered datetime not null, date_updated datetime not null, num_comments integer not null default 0, comments varchar(250) not null default '', - author varchar(250) not null default '') TYPE=InnoDB DEFAULT CHARSET=UTF8;; + author varchar(250) not null default '') TYPE=InnoDB DEFAULT CHARSET=UTF8; create index ttrss_entries_date_entered_index on ttrss_entries(date_entered); @@ -151,7 +151,7 @@ create table ttrss_user_entries ( published bool not null default 0, last_read datetime, score int not null default 0, - note text, + note longtext, unread bool not null default 1, index (ref_id), foreign key (ref_id) references ttrss_entries(id) ON DELETE CASCADE, @@ -160,7 +160,7 @@ create table ttrss_user_entries ( 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) TYPE=InnoDB DEFAULT CHARSET=UTF8;; + foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) TYPE=InnoDB DEFAULT CHARSET=UTF8; create table ttrss_entry_comments (id integer not null primary key, ref_id integer not null, @@ -170,11 +170,11 @@ create table ttrss_entry_comments (id integer not null primary key, index (ref_id), foreign key (ref_id) references ttrss_entries(id) ON DELETE CASCADE, 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, 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 (2, 'content', 'Content'); @@ -188,7 +188,7 @@ insert into ttrss_filter_types (id,name,description) values (6, 'author', 'Autho create table ttrss_filter_actions (id integer not null primary key, 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', 'Filter article'); @@ -228,7 +228,7 @@ create table ttrss_filters (id integer not null primary key auto_increment, index (feed_id), foreign key (feed_id) references ttrss_feeds(id) ON DELETE CASCADE, 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, owner_uid integer not null, @@ -237,9 +237,9 @@ create table ttrss_tags (id integer primary key auto_increment, index (post_int_id), foreign key (post_int_id) references ttrss_user_entries(int_id) ON DELETE CASCADE, 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_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 (68); @@ -250,23 +250,23 @@ create table ttrss_enclosures (id integer primary key auto_increment, title text not null, duration text not null, index (post_id), - foreign key (post_id) references ttrss_entries(id) ON DELETE cascade) TYPE=InnoDB DEFAULT CHARSET=UTF8;; + foreign key (post_id) references ttrss_entries(id) ON DELETE cascade) TYPE=InnoDB DEFAULT CHARSET=UTF8; create table ttrss_settings_profiles(id integer primary key auto_increment, title varchar(250) not null, owner_uid integer not null, 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, - 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 (2, 'string'); insert into ttrss_prefs_types (id, type_name) values (3, 'integer'); 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 (2, 'Interface'); @@ -282,7 +282,7 @@ create table ttrss_prefs (pref_name varchar(250) not null primary key, index(type_id), foreign key (type_id) references ttrss_prefs_types(id), index(section_id), - foreign key (section_id) references ttrss_prefs_sections(id)) TYPE=InnoDB DEFAULT CHARSET=UTF8;; + foreign key (section_id) references ttrss_prefs_sections(id)) TYPE=InnoDB DEFAULT CHARSET=UTF8; insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_FEED_ICONS', 1, 'true', 'Enable feed icons',3); 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); @@ -412,20 +412,20 @@ create table ttrss_user_prefs ( 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) 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;; + 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, data text, expire integer not null, index (id), - index (expire)) TYPE=InnoDB DEFAULT CHARSET=UTF8;; + index (expire)) TYPE=InnoDB DEFAULT CHARSET=UTF8; create table ttrss_feedbrowser_cache ( feed_url text not null, @@ -438,12 +438,12 @@ create table ttrss_labels2 (id integer not null primary key auto_increment, fg_color varchar(15) not null default '', bg_color varchar(15) not null default '', foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE -) TYPE=InnoDB DEFAULT CHARSET=UTF8;; +) TYPE=InnoDB DEFAULT CHARSET=UTF8; create table ttrss_user_labels2 (label_id integer not null, article_id integer not null, foreign key (label_id) references ttrss_labels2(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; commit;