Attachment 78234 Details for Bug 15326 – Bug 15326: (follow-up) utf8 to utf8mb4

[patch] Bug 15326: (follow-up) utf8 to utf8mb4

Bug-15326-follow-up-utf8-to-utf8mb4.patch (text/plain), 3.40 KB, created by Aleisha Amohia on 2018-08-28 22:54:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aleisha Amohia

Created: 2018-08-28 22:54:08 UTC

Size: 3.40 KB

patch

obsolete

>From c884284bb18c85523a35511c575c6f408c7cca84 Mon Sep 17 00:00:00 2001
>From: Josef Moravec <josef.moravec@gmail.com>
>Date: Mon, 25 Jun 2018 14:32:11 +0000
>Subject: [PATCH] Bug 15326: (follow-up) utf8 to utf8mb4
>
>Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
>---
> 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 72956b2..8283c15 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -4227,20 +4227,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

Actions: View | Diff | Splinter Review

Attachments on bug 15326: 45621 | 58272 | 58607 | 58608 | 58609 | 58787 | 63904 | 63905 | 64241 | 64941 | 64942 | 66255 | 70866 | 70867 | 70868 | 70869 | 70870 | 70871 | 76387 | 76388 | 76389 | 76390 | 76391 | 76392 | 78232 | 78233 | 78234 | 78235 | 78236 | 78237 | 78238 | 78240 | 79269 | 83318 | 83319 | 83320 | 83321 | 83322 | 83323 | 83324 | 83325 | 83326 | 83404 | 83405 | 83406 | 83407 | 83408 | 83409 | 83410 | 83411 | 83412 | 84682 | 84683 | 84684 | 84685 | 84686 | 84687 | 84688 | 84689 | 84690 | 84691 | 87494 | 87495 | 87496 | 87497 | 87498 | 87499 | 87500 | 87501 | 87502 | 87503 | 87608 | 87609 | 87610 | 87617 | 96084 | 96085 | 96086 | 96087 | 96088 | 96089 | 96090 | 96091 | 96092 | 96093 | 96094 | 96095 | 96096 | 96097 | 96098 | 97237 | 101565 | 101566 | 101567 | 101568 | 101569 | 101570 | 101571 | 101572 | 101573 | 101574 | 101575 | 101576 | 101577 | 101578 | 101579 | 101580 | 128341 | 128342 | 128343 | 128344 | 128345 | 128346 | 128347 | 128348 | 128349 | 128350 | 128351 | 128352 | 128353 | 128354 | 128355 | 128356 | 128357 | 128585 | 128642 | 136432 | 136757 | 136768 | 138489 | 138493 | 139028 | 139029 | 139030 | 139031 | 139111 | 139123 | 139124 | 139125 | 139172 | 139173 | 139174