From bf9a00e956e99778a11f9fd69f262d8a6480ce3e Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Mon, 25 Jun 2018 14:32:11 +0000 Subject: [PATCH] Bug 15326: (follow-up) utf8 to utf8mb4 Signed-off-by: Josef Moravec --- installer/data/mysql/atomicupdate/bug15326-add_cms_pages.sql | 12 ++++++------ installer/data/mysql/kohastructure.sql | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug15326-add_cms_pages.sql b/installer/data/mysql/atomicupdate/bug15326-add_cms_pages.sql index 74c45f7..9c05178 100644 --- a/installer/data/mysql/atomicupdate/bug15326-add_cms_pages.sql +++ b/installer/data/mysql/atomicupdate/bug15326-add_cms_pages.sql @@ -1,17 +1,17 @@ CREATE TABLE `cms_pages` ( `id` int(6) NOT NULL AUTO_INCREMENT, `parent` int(6) DEFAULT NULL, - `branchcode` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL, - `lang` varchar(25) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `title` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, - `title_link` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL, + `branchcode` varchar(10) DEFAULT NULL, + `lang` varchar(25) NOT NULL DEFAULT '', + `title` varchar(255) DEFAULT NULL, + `title_link` varchar(64) DEFAULT NULL, `sortorder` int(3) NOT NULL DEFAULT 0, `location` tinyint(1) DEFAULT NULL, `publish` tinyint(1) NOT NULL DEFAULT 0, - `content` text COLLATE utf8_unicode_ci, + `content` text, PRIMARY KEY (`id`), INDEX `parent_index` (`parent`), INDEX `lang_index` (`lang`), INDEX `branchcode_index` (`branchcode`), CONSTRAINT `cmspages_branchcode_ibfk` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 232ce71..221f668 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -4345,20 +4345,20 @@ DROP TABLE IF EXISTS `cms_pages`; CREATE TABLE `cms_pages` ( `id` int(6) NOT NULL AUTO_INCREMENT, `parent` int(6) DEFAULT NULL, - `branchcode` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL, - `lang` varchar(25) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `title` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, - `title_link` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL, + `branchcode` varchar(10) DEFAULT NULL, + `lang` varchar(25) NOT NULL DEFAULT '', + `title` varchar(255) DEFAULT NULL, + `title_link` varchar(64) DEFAULT NULL, `sortorder` int(3) NOT NULL DEFAULT 0, `location` tinyint(1) DEFAULT NULL, `publish` tinyint(1) NOT NULL DEFAULT 0, - `content` text COLLATE utf8_unicode_ci, + `content` text, PRIMARY KEY (`id`), INDEX `parent_index` (`parent`), INDEX `lang_index` (`lang`), INDEX `branchcode_index` (`branchcode`), CONSTRAINT `pages_branchcode_ibfk` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -- 2.1.4