From cd9fcfe4673cb4d3003b13747c26202f8e936d9d Mon Sep 17 00:00:00 2001 From: DariusIII Date: Mon, 26 Oct 2015 08:45:05 +0100 Subject: [PATCH] Fix patches --- resources/db/patches/mysql/+1~videos.sql | 2 +- resources/db/patches/mysql/+2~tv_info.sql | 6 +++--- resources/db/patches/mysql/+3~tv_episodes.sql | 4 ++-- resources/db/patches/mysql/+6~user_series.sql | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/db/patches/mysql/+1~videos.sql b/resources/db/patches/mysql/+1~videos.sql index 9ff80999a..419ff9abb 100755 --- a/resources/db/patches/mysql/+1~videos.sql +++ b/resources/db/patches/mysql/+1~videos.sql @@ -5,7 +5,7 @@ DROP TABLE IF EXISTS videos; CREATE TABLE videos ( id MEDIUMINT(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'Show''s ID to be used in other tables as reference.', type TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT '0 = TV, 1 = Film, 2 = Anime', - title VARCHAR(180) CHARSET = utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Name of the video.', + title VARCHAR(180) CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Name of the video.', countries_id CHAR(2) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT 'Two character country code (FK to countries table).', started DATETIME NOT NULL COMMENT 'Date (UTC) of production''s first airing.', imdb MEDIUMINT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'ID number for IMDB site (without the ''tt'' prefix).', diff --git a/resources/db/patches/mysql/+2~tv_info.sql b/resources/db/patches/mysql/+2~tv_info.sql index 8575e89f0..1b43fe06c 100755 --- a/resources/db/patches/mysql/+2~tv_info.sql +++ b/resources/db/patches/mysql/+2~tv_info.sql @@ -4,12 +4,12 @@ DROP TABLE IF EXISTS tv_info; CREATE TABLE tv_info ( videos_id MEDIUMINT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'FK to video.id', - summary TEXT CHARSET = utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Description/summary of the show.', - publisher VARCHAR(50) CHARSET = utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'The channel/network of production/release (ABC, BBC, Showtime, etc.).', + summary TEXT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Description/summary of the show.', + publisher VARCHAR(50) CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'The channel/network of production/release (ABC, BBC, Showtime, etc.).', image TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Does the video have a cover image?', PRIMARY KEY (videos_id), KEY ix_tv_info_image (image) ) ENGINE = MyISAM DEFAULT CHARSET = utf8 - COLLATE = utf8_unicode_ci; \ No newline at end of file + COLLATE = utf8_unicode_ci; diff --git a/resources/db/patches/mysql/+3~tv_episodes.sql b/resources/db/patches/mysql/+3~tv_episodes.sql index df480cc8b..86b6dcfef 100755 --- a/resources/db/patches/mysql/+3~tv_episodes.sql +++ b/resources/db/patches/mysql/+3~tv_episodes.sql @@ -8,9 +8,9 @@ CREATE TABLE tv_episodes ( series SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Number of series/season.', episode SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Number of episode within series', se_complete VARCHAR(10) COLLATE utf8_unicode_ci NOT NULL COMMENT 'String version of Series/Episode as taken from release subject (i.e. S02E21+22).', - title VARCHAR(180) CHARSET = utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Title of the episode.', + title VARCHAR(180) CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Title of the episode.', firstaired DATETIME NOT NULL COMMENT 'Date of original airing/release.', - summary TEXT CHARSET = utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Description/summary of the episode.', + summary TEXT CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Description/summary of the episode.', PRIMARY KEY (id), UNIQUE INDEX ix_tv_episodes_videos_id (videos_id, series, episode) ) diff --git a/resources/db/patches/mysql/+6~user_series.sql b/resources/db/patches/mysql/+6~user_series.sql index f1addcd74..95fd56902 100644 --- a/resources/db/patches/mysql/+6~user_series.sql +++ b/resources/db/patches/mysql/+6~user_series.sql @@ -1,6 +1,6 @@ # This patch will make the necessary changes to the user_series # table to support the new videos implementation -# At this time, we're not sure if we can preserve the users shows +# At this time, we are not sure if we can preserve the users shows # data as the tvrage data is largely useless due to the title insert bug # Truncate for now @@ -10,4 +10,4 @@ TRUNCATE TABLE userseries; ALTER TABLE userseries DROP INDEX ix_userseries_userid, CHANGE COLUMN rageid videos_id INT(16) NOT NULL COMMENT 'FK to videos.id', - ADD INDEX ix_userseries_videos_id (userid, videos_id); \ No newline at end of file + ADD INDEX ix_userseries_videos_id (userid, videos_id);