From 00ddf5b2e62a800e0f6e3eaf544e2db6693b84dd Mon Sep 17 00:00:00 2001 From: Yves Hoppe Date: Wed, 27 Jul 2016 21:37:46 +0200 Subject: [PATCH] Changing collation to utf8mb4 (#226) * Changing collation to utf8mb4 * Increased Joomla version requirement --- manifest.xml | 2 +- .../com_weblinks/sql/install.mysql.sql | 4 +-- .../com_weblinks/sql/updates/mysql/3.5.1.sql | 25 +++++++++++++++++++ .../components/com_weblinks/weblinks.xml | 2 +- src/modules/mod_weblinks/mod_weblinks.xml | 2 +- src/pkg_weblinks.xml | 2 +- src/plugins/finder/weblinks/weblinks.xml | 2 +- src/plugins/search/weblinks/weblinks.xml | 2 +- 8 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 src/administrator/components/com_weblinks/sql/updates/mysql/3.5.1.sql diff --git a/manifest.xml b/manifest.xml index 88bb859..13e1c8f 100644 --- a/manifest.xml +++ b/manifest.xml @@ -11,6 +11,6 @@ https://github.com/joomla-extensions/weblinks/releases/download/3.5.0/pkg-weblinks-3.5.0.zip - + diff --git a/src/administrator/components/com_weblinks/sql/install.mysql.sql b/src/administrator/components/com_weblinks/sql/install.mysql.sql index ba504a1..a9d3690 100644 --- a/src/administrator/components/com_weblinks/sql/install.mysql.sql +++ b/src/administrator/components/com_weblinks/sql/install.mysql.sql @@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `#__weblinks` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `catid` int(11) NOT NULL DEFAULT 0, `title` varchar(250) NOT NULL DEFAULT '', - `alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '', + `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '', `url` varchar(250) NOT NULL DEFAULT '', `description` text NOT NULL, `hits` int(11) NOT NULL DEFAULT 0, @@ -48,4 +48,4 @@ CREATE TABLE IF NOT EXISTS `#__weblinks` ( KEY `idx_featured_catid` (`featured`,`catid`), KEY `idx_language` (`language`), KEY `idx_xreference` (`xreference`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci; diff --git a/src/administrator/components/com_weblinks/sql/updates/mysql/3.5.1.sql b/src/administrator/components/com_weblinks/sql/updates/mysql/3.5.1.sql new file mode 100644 index 0000000..5589649 --- /dev/null +++ b/src/administrator/components/com_weblinks/sql/updates/mysql/3.5.1.sql @@ -0,0 +1,25 @@ +# Conversion to utf8mb4 + +-- +-- Step 1.1: Enlarge columns to avoid data loss on later conversion to utf8mb4 +-- + +ALTER TABLE `#__weblinks` MODIFY `alias` varchar(400) NOT NULL DEFAULT ''; + +-- +-- Step 1.2: Convert table to utf8mb4 chracter set with utf8mb4_unicode_ci collation +-- + +ALTER TABLE `#__weblinks` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; + +-- +-- Step 1.3: Set collation to utf8mb4_bin for formerly utf8_bin collated columns +-- + +ALTER TABLE `#__weblinks` MODIFY `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT ''; + +-- +-- Step 1.4: Set default character set and collation for all tables +-- + +ALTER TABLE `#__weblinks` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; diff --git a/src/administrator/components/com_weblinks/weblinks.xml b/src/administrator/components/com_weblinks/weblinks.xml index 07f3aa3..524d131 100644 --- a/src/administrator/components/com_weblinks/weblinks.xml +++ b/src/administrator/components/com_weblinks/weblinks.xml @@ -1,5 +1,5 @@ - + com_weblinks Joomla! Project ##DATE## diff --git a/src/modules/mod_weblinks/mod_weblinks.xml b/src/modules/mod_weblinks/mod_weblinks.xml index 644f488..193a260 100644 --- a/src/modules/mod_weblinks/mod_weblinks.xml +++ b/src/modules/mod_weblinks/mod_weblinks.xml @@ -1,5 +1,5 @@ - + mod_weblinks Joomla! Project ##DATE## diff --git a/src/pkg_weblinks.xml b/src/pkg_weblinks.xml index 51b6265..353e0ee 100644 --- a/src/pkg_weblinks.xml +++ b/src/pkg_weblinks.xml @@ -1,5 +1,5 @@ - + pkg_weblinks weblinks December 2012 diff --git a/src/plugins/finder/weblinks/weblinks.xml b/src/plugins/finder/weblinks/weblinks.xml index 37899fe..acc98c5 100644 --- a/src/plugins/finder/weblinks/weblinks.xml +++ b/src/plugins/finder/weblinks/weblinks.xml @@ -1,5 +1,5 @@ - + plg_finder_weblinks Joomla! Project ##DATE## diff --git a/src/plugins/search/weblinks/weblinks.xml b/src/plugins/search/weblinks/weblinks.xml index e7b0dc9..d5a8e33 100644 --- a/src/plugins/search/weblinks/weblinks.xml +++ b/src/plugins/search/weblinks/weblinks.xml @@ -1,5 +1,5 @@ - + plg_search_weblinks Joomla! Project ##DATE##