From 1d4f6f10be588711abbdf5c3821fe7568e43b6cf Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Wed, 16 Mar 2016 14:52:03 +0000 Subject: [PATCH 01/26] update table to utf8mb4 collation --- component/admin/sql/updates/mysql/4.0.14.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 component/admin/sql/updates/mysql/4.0.14.sql diff --git a/component/admin/sql/updates/mysql/4.0.14.sql b/component/admin/sql/updates/mysql/4.0.14.sql new file mode 100644 index 00000000..6ef20f02 --- /dev/null +++ b/component/admin/sql/updates/mysql/4.0.14.sql @@ -0,0 +1 @@ +ALTER TABLE `#__localise` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; From bc8fe9cd9d8f520e29f0b016dff2a5be8435b7cd Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Wed, 16 Mar 2016 14:53:28 +0000 Subject: [PATCH 02/26] create table with utf8mb4 collation --- component/admin/sql/install/mysql/install.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/component/admin/sql/install/mysql/install.sql b/component/admin/sql/install/mysql/install.sql index fc6be3bf..6794ee9e 100644 --- a/component/admin/sql/install/mysql/install.sql +++ b/component/admin/sql/install/mysql/install.sql @@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `#__localise` ( `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`), UNIQUE KEY `idx_path` (`path`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci; From f772ef070c273364ed3ed5187cc97c00ce1bb628 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Wed, 16 Mar 2016 15:23:50 +0000 Subject: [PATCH 03/26] index and varchar length --- component/admin/sql/install/mysql/install.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/component/admin/sql/install/mysql/install.sql b/component/admin/sql/install/mysql/install.sql index 6794ee9e..4d1c2753 100644 --- a/component/admin/sql/install/mysql/install.sql +++ b/component/admin/sql/install/mysql/install.sql @@ -1,9 +1,9 @@ CREATE TABLE IF NOT EXISTS `#__localise` ( `id` int(11) unsigned NOT NULL AUTO_INCREMENT, `asset_id` int(11) NOT NULL, - `path` varchar(255) NOT NULL, + `path` varchar(400) NOT NULL DEFAULT '', `checked_out` int(10) unsigned NOT NULL DEFAULT '0', `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`), - UNIQUE KEY `idx_path` (`path`) + UNIQUE KEY `idx_path` (`path`(100)) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci; From 15b73ad9501a2a05e8ef5b1ee2d368b465d25440 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Wed, 16 Mar 2016 15:24:39 +0000 Subject: [PATCH 04/26] better update sequence --- component/admin/sql/updates/mysql/4.0.14.sql | 45 ++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/component/admin/sql/updates/mysql/4.0.14.sql b/component/admin/sql/updates/mysql/4.0.14.sql index 6ef20f02..7b5c390c 100644 --- a/component/admin/sql/updates/mysql/4.0.14.sql +++ b/component/admin/sql/updates/mysql/4.0.14.sql @@ -1 +1,46 @@ +-- +-- Step 1 of the UTF-8 Multibyte (utf8mb4) conversion for MySQL +-- +-- Drop indexes which will be added again in step 2. +-- +-- This file here will be processed ignoring any exceptions caused by indexes +-- to be dropped do not exist. +-- +-- The file for step 2 will the be processed with reporting exceptions. +-- +ALTER TABLE `#__localise` DROP KEY `idx_path`; + +-- +-- Step 2 of the UTF-8 Multibyte (utf8mb4) conversion for MySQL +-- +-- Add back indexes previosly dropped with step 1, +-- but with limited lenghts of columns, and then perform the conversions +-- for utf8mb4. +-- +-- This file here will the be processed with reporting exceptions. +-- +-- +-- Step 2.1: Limit indexes to first 100 so their max allowed lengths would not get exceeded with utf8mb4. +-- +ALTER TABLE `#__localise` ADD UNIQUE KEY `idx_path` (`path`(100)); + +-- +-- Step 2.2: Enlarge columns to avoid data loss on later conversion to utf8mb4 +-- +ALTER TABLE `#__localise` MODIFY `path` varchar(400) NOT NULL DEFAULT ''; + +-- +-- Step 2.3: Convert all tables to utf8mb4 chracter set with utf8mb4_unicode_ci collation. +-- ALTER TABLE `#__localise` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; + +-- +-- Step 2.4: Set collation to utf8mb4_bin for formerly utf8_bin collated columns +-- and for the lang_code column of the languages table. +-- +-- Not needed. + +-- +-- Step 2.5: Set default character set and collation for all tables. +-- +ALTER TABLE `#__localise` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; From d0fb14c78a6bce7dca289ca8e7b16245c405e47e Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Wed, 16 Mar 2016 15:29:44 +0000 Subject: [PATCH 05/26] unicode, not general --- component/admin/sql/updates/mysql/4.0.14.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/component/admin/sql/updates/mysql/4.0.14.sql b/component/admin/sql/updates/mysql/4.0.14.sql index 7b5c390c..0176a469 100644 --- a/component/admin/sql/updates/mysql/4.0.14.sql +++ b/component/admin/sql/updates/mysql/4.0.14.sql @@ -43,4 +43,4 @@ ALTER TABLE `#__localise` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unico -- -- Step 2.5: Set default character set and collation for all tables. -- -ALTER TABLE `#__localise` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__localise` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; From ad947a0749aba4a809e2ded369ae98c42a34cf02 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Wed, 16 Mar 2016 16:06:38 +0000 Subject: [PATCH 06/26] add the new #__localise_revised_values table also in utf8mb4 charset and collation --- component/admin/sql/install/mysql/install.sql | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/component/admin/sql/install/mysql/install.sql b/component/admin/sql/install/mysql/install.sql index 4d1c2753..063e5c09 100644 --- a/component/admin/sql/install/mysql/install.sql +++ b/component/admin/sql/install/mysql/install.sql @@ -7,3 +7,16 @@ CREATE TABLE IF NOT EXISTS `#__localise` ( PRIMARY KEY (`id`), UNIQUE KEY `idx_path` (`path`(100)) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci; + +CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `client` varchar(255) NOT NULL, + `reftag` varchar(6) NOT NULL, + `tag` varchar(6) NOT NULL, + `filename` varchar(255) NOT NULL, + `revised` tinyint(1) NOT NULL DEFAULT 0, + `key` varchar(255) NOT NULL, + `target_text` mediumtext NOT NULL, + `source_text` mediumtext NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci; From 0fb4ff56e9818e10ee90dd65f02f207b7a128830 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Wed, 16 Mar 2016 16:08:36 +0000 Subject: [PATCH 07/26] Convert the new table #__localise_revised_values to utf8mb4 too --- component/admin/sql/updates/mysql/4.0.14.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/component/admin/sql/updates/mysql/4.0.14.sql b/component/admin/sql/updates/mysql/4.0.14.sql index 0176a469..f1861118 100644 --- a/component/admin/sql/updates/mysql/4.0.14.sql +++ b/component/admin/sql/updates/mysql/4.0.14.sql @@ -33,6 +33,7 @@ ALTER TABLE `#__localise` MODIFY `path` varchar(400) NOT NULL DEFAULT ''; -- Step 2.3: Convert all tables to utf8mb4 chracter set with utf8mb4_unicode_ci collation. -- ALTER TABLE `#__localise` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__localise_revised_values` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; -- -- Step 2.4: Set collation to utf8mb4_bin for formerly utf8_bin collated columns @@ -44,3 +45,4 @@ ALTER TABLE `#__localise` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unico -- Step 2.5: Set default character set and collation for all tables. -- ALTER TABLE `#__localise` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__localise_revised_values` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; From a5a744f56c423d27440691e9c479a79d35899b90 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Wed, 16 Mar 2016 16:30:34 +0000 Subject: [PATCH 08/26] remove comments that don't make sense is this scenario --- component/admin/sql/updates/mysql/4.0.14.sql | 8 -------- 1 file changed, 8 deletions(-) diff --git a/component/admin/sql/updates/mysql/4.0.14.sql b/component/admin/sql/updates/mysql/4.0.14.sql index f1861118..9b766d6f 100644 --- a/component/admin/sql/updates/mysql/4.0.14.sql +++ b/component/admin/sql/updates/mysql/4.0.14.sql @@ -3,11 +3,6 @@ -- -- Drop indexes which will be added again in step 2. -- --- This file here will be processed ignoring any exceptions caused by indexes --- to be dropped do not exist. --- --- The file for step 2 will the be processed with reporting exceptions. --- ALTER TABLE `#__localise` DROP KEY `idx_path`; -- @@ -17,9 +12,6 @@ ALTER TABLE `#__localise` DROP KEY `idx_path`; -- but with limited lenghts of columns, and then perform the conversions -- for utf8mb4. -- --- This file here will the be processed with reporting exceptions. --- --- -- Step 2.1: Limit indexes to first 100 so their max allowed lengths would not get exceeded with utf8mb4. -- ALTER TABLE `#__localise` ADD UNIQUE KEY `idx_path` (`path`(100)); From dd9a8715ca425d812397a43a14761e42f48cb648 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Wed, 16 Mar 2016 16:45:44 +0000 Subject: [PATCH 09/26] change path collation to utf8mb4_bin on update --- component/admin/sql/updates/mysql/4.0.14.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/component/admin/sql/updates/mysql/4.0.14.sql b/component/admin/sql/updates/mysql/4.0.14.sql index 9b766d6f..383c03cd 100644 --- a/component/admin/sql/updates/mysql/4.0.14.sql +++ b/component/admin/sql/updates/mysql/4.0.14.sql @@ -31,7 +31,7 @@ ALTER TABLE `#__localise_revised_values` CONVERT TO CHARACTER SET utf8mb4 COLLAT -- Step 2.4: Set collation to utf8mb4_bin for formerly utf8_bin collated columns -- and for the lang_code column of the languages table. -- --- Not needed. +ALTER TABLE `#__localise` MODIFY `path` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT ''; -- -- Step 2.5: Set default character set and collation for all tables. From f60eb2aea2c31127961be8e7e996b8ddb878899a Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Wed, 16 Mar 2016 16:46:20 +0000 Subject: [PATCH 10/26] remove language table comment --- component/admin/sql/updates/mysql/4.0.14.sql | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/component/admin/sql/updates/mysql/4.0.14.sql b/component/admin/sql/updates/mysql/4.0.14.sql index 383c03cd..14b48554 100644 --- a/component/admin/sql/updates/mysql/4.0.14.sql +++ b/component/admin/sql/updates/mysql/4.0.14.sql @@ -28,8 +28,7 @@ ALTER TABLE `#__localise` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unico ALTER TABLE `#__localise_revised_values` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; -- --- Step 2.4: Set collation to utf8mb4_bin for formerly utf8_bin collated columns --- and for the lang_code column of the languages table. +-- Step 2.4: Set collation to utf8mb4_bin for formerly utf8_bin collated columns. -- ALTER TABLE `#__localise` MODIFY `path` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT ''; From 795b3bd266f113179f70ba5c4d22d0bb144731ac Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Wed, 16 Mar 2016 16:47:36 +0000 Subject: [PATCH 11/26] create path with utf8mb4_bin collation --- component/admin/sql/install/mysql/install.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/component/admin/sql/install/mysql/install.sql b/component/admin/sql/install/mysql/install.sql index 063e5c09..11765af5 100644 --- a/component/admin/sql/install/mysql/install.sql +++ b/component/admin/sql/install/mysql/install.sql @@ -1,7 +1,7 @@ CREATE TABLE IF NOT EXISTS `#__localise` ( `id` int(11) unsigned NOT NULL AUTO_INCREMENT, `asset_id` int(11) NOT NULL, - `path` varchar(400) NOT NULL DEFAULT '', + `path` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '', `checked_out` int(10) unsigned NOT NULL DEFAULT '0', `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`), From b4f8aeb99490ad31d204609153c520827f981573 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Fri, 18 Mar 2016 11:11:18 +0000 Subject: [PATCH 12/26] Remove unique key and resize idx_path index to 191 --- component/admin/sql/install/mysql/install.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/component/admin/sql/install/mysql/install.sql b/component/admin/sql/install/mysql/install.sql index 11765af5..106eb6c6 100644 --- a/component/admin/sql/install/mysql/install.sql +++ b/component/admin/sql/install/mysql/install.sql @@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `#__localise` ( `checked_out` int(10) unsigned NOT NULL DEFAULT '0', `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`), - UNIQUE KEY `idx_path` (`path`(100)) + KEY `idx_path` (`path`(191)) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci; CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( From 468d12511581a46834da9deef0073721c6876a7f Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Fri, 18 Mar 2016 11:11:28 +0000 Subject: [PATCH 13/26] Remove unique key and resize idx_path index to 191 --- component/admin/sql/updates/mysql/4.0.14.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/component/admin/sql/updates/mysql/4.0.14.sql b/component/admin/sql/updates/mysql/4.0.14.sql index 14b48554..eaff1bcf 100644 --- a/component/admin/sql/updates/mysql/4.0.14.sql +++ b/component/admin/sql/updates/mysql/4.0.14.sql @@ -14,7 +14,7 @@ ALTER TABLE `#__localise` DROP KEY `idx_path`; -- -- Step 2.1: Limit indexes to first 100 so their max allowed lengths would not get exceeded with utf8mb4. -- -ALTER TABLE `#__localise` ADD UNIQUE KEY `idx_path` (`path`(100)); +ALTER TABLE `#__localise` ADD KEY `idx_path` (`path`(191)); -- -- Step 2.2: Enlarge columns to avoid data loss on later conversion to utf8mb4 From 15124ce2e95437acd80edae13f7cc6b435ef6954 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Fri, 18 Mar 2016 11:18:02 +0000 Subject: [PATCH 14/26] cleaner comments --- component/admin/sql/updates/mysql/4.0.14.sql | 26 +++----------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/component/admin/sql/updates/mysql/4.0.14.sql b/component/admin/sql/updates/mysql/4.0.14.sql index eaff1bcf..60119614 100644 --- a/component/admin/sql/updates/mysql/4.0.14.sql +++ b/component/admin/sql/updates/mysql/4.0.14.sql @@ -1,39 +1,21 @@ --- --- Step 1 of the UTF-8 Multibyte (utf8mb4) conversion for MySQL --- +-- Step 1 of the UTF-8 Multibyte (utf8mb4) conversion for MySQL. -- Drop indexes which will be added again in step 2. --- ALTER TABLE `#__localise` DROP KEY `idx_path`; --- --- Step 2 of the UTF-8 Multibyte (utf8mb4) conversion for MySQL --- --- Add back indexes previosly dropped with step 1, --- but with limited lenghts of columns, and then perform the conversions --- for utf8mb4. --- --- Step 2.1: Limit indexes to first 100 so their max allowed lengths would not get exceeded with utf8mb4. --- +-- Step 2 of the UTF-8 Multibyte (utf8mb4) conversion for MySQL. +-- Step 2.1: Limit indexes so their max allowed lengths would not get exceeded with utf8mb4. ALTER TABLE `#__localise` ADD KEY `idx_path` (`path`(191)); --- --- Step 2.2: Enlarge columns to avoid data loss on later conversion to utf8mb4 --- +-- Step 2.2: Enlarge columns to avoid data loss on later conversion to utf8mb4. ALTER TABLE `#__localise` MODIFY `path` varchar(400) NOT NULL DEFAULT ''; --- -- Step 2.3: Convert all tables to utf8mb4 chracter set with utf8mb4_unicode_ci collation. --- ALTER TABLE `#__localise` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; ALTER TABLE `#__localise_revised_values` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; --- -- Step 2.4: Set collation to utf8mb4_bin for formerly utf8_bin collated columns. --- ALTER TABLE `#__localise` MODIFY `path` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT ''; --- -- Step 2.5: Set default character set and collation for all tables. --- ALTER TABLE `#__localise` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; ALTER TABLE `#__localise_revised_values` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; From fbdf4928266a03e1ada4732375c9ee6ac3fc46d6 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 19 Mar 2016 16:05:57 +0000 Subject: [PATCH 15/26] PoC install over utf8 and utf8mb4 db systems also correct 4.0.4 filename (a space existed inthe beggining of the filename) --- .../admin/sql/install/mysql/install-utf8.sql | 22 +++++++++++++++++++ .../admin/sql/updates/mysql-utf8/0.0.1.sql | 0 .../4.0.10-dev.sql} | 0 .../sql/updates/mysql-utf8/4.0.11-dev.sql | 12 ++++++++++ .../sql/updates/mysql-utf8/4.0.12-dev.sql | 12 ++++++++++ .../sql/updates/mysql-utf8/4.0.3-dev.sql | 12 ++++++++++ .../sql/updates/mysql-utf8/4.0.4-dev.sql | 12 ++++++++++ .../sql/updates/mysql-utf8/4.0.5-dev.sql | 12 ++++++++++ .../sql/updates/mysql-utf8/4.0.6-dev.sql | 12 ++++++++++ .../sql/updates/mysql-utf8/4.0.7-dev.sql | 12 ++++++++++ .../sql/updates/mysql-utf8/4.0.8-dev.sql | 12 ++++++++++ .../sql/updates/mysql-utf8/4.0.9-dev.sql | 12 ++++++++++ .../admin/sql/updates/mysql-utf8/4.0.sql | 12 ++++++++++ .../admin/sql/updates/mysql-utf8/index.html | 1 + .../admin/sql/updates/mysql/4.0.4-dev.sql | 12 ++++++++++ localise.xml | 11 +++++----- 16 files changed, 161 insertions(+), 5 deletions(-) create mode 100644 component/admin/sql/install/mysql/install-utf8.sql create mode 100644 component/admin/sql/updates/mysql-utf8/0.0.1.sql rename component/admin/sql/updates/{mysql/ 4.0.4-dev.sql => mysql-utf8/4.0.10-dev.sql} (100%) create mode 100644 component/admin/sql/updates/mysql-utf8/4.0.11-dev.sql create mode 100644 component/admin/sql/updates/mysql-utf8/4.0.12-dev.sql create mode 100644 component/admin/sql/updates/mysql-utf8/4.0.3-dev.sql create mode 100644 component/admin/sql/updates/mysql-utf8/4.0.4-dev.sql create mode 100644 component/admin/sql/updates/mysql-utf8/4.0.5-dev.sql create mode 100644 component/admin/sql/updates/mysql-utf8/4.0.6-dev.sql create mode 100644 component/admin/sql/updates/mysql-utf8/4.0.7-dev.sql create mode 100644 component/admin/sql/updates/mysql-utf8/4.0.8-dev.sql create mode 100644 component/admin/sql/updates/mysql-utf8/4.0.9-dev.sql create mode 100644 component/admin/sql/updates/mysql-utf8/4.0.sql create mode 100644 component/admin/sql/updates/mysql-utf8/index.html create mode 100644 component/admin/sql/updates/mysql/4.0.4-dev.sql diff --git a/component/admin/sql/install/mysql/install-utf8.sql b/component/admin/sql/install/mysql/install-utf8.sql new file mode 100644 index 00000000..4ce6b060 --- /dev/null +++ b/component/admin/sql/install/mysql/install-utf8.sql @@ -0,0 +1,22 @@ +CREATE TABLE IF NOT EXISTS `#__localise` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `asset_id` int(11) NOT NULL, + `path` varchar(255) NOT NULL, + `checked_out` int(10) unsigned NOT NULL DEFAULT '0', + `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + PRIMARY KEY (`id`), + UNIQUE KEY `idx_path` (`path`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `client` varchar(255) NOT NULL, + `reftag` varchar(6) NOT NULL, + `tag` varchar(6) NOT NULL, + `filename` varchar(255) NOT NULL, + `revised` tinyint(1) NOT NULL DEFAULT 0, + `key` varchar(255) NOT NULL, + `target_text` mediumtext NOT NULL, + `source_text` mediumtext NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql-utf8/0.0.1.sql b/component/admin/sql/updates/mysql-utf8/0.0.1.sql new file mode 100644 index 00000000..e69de29b diff --git a/component/admin/sql/updates/mysql/ 4.0.4-dev.sql b/component/admin/sql/updates/mysql-utf8/4.0.10-dev.sql similarity index 100% rename from component/admin/sql/updates/mysql/ 4.0.4-dev.sql rename to component/admin/sql/updates/mysql-utf8/4.0.10-dev.sql diff --git a/component/admin/sql/updates/mysql-utf8/4.0.11-dev.sql b/component/admin/sql/updates/mysql-utf8/4.0.11-dev.sql new file mode 100644 index 00000000..67c2247f --- /dev/null +++ b/component/admin/sql/updates/mysql-utf8/4.0.11-dev.sql @@ -0,0 +1,12 @@ +CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `client` varchar(255) NOT NULL, + `reftag` varchar(6) NOT NULL, + `tag` varchar(6) NOT NULL, + `filename` varchar(255) NOT NULL, + `revised` tinyint(1) NOT NULL DEFAULT 0, + `key` varchar(255) NOT NULL, + `target_text` mediumtext NOT NULL, + `source_text` mediumtext NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql-utf8/4.0.12-dev.sql b/component/admin/sql/updates/mysql-utf8/4.0.12-dev.sql new file mode 100644 index 00000000..67c2247f --- /dev/null +++ b/component/admin/sql/updates/mysql-utf8/4.0.12-dev.sql @@ -0,0 +1,12 @@ +CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `client` varchar(255) NOT NULL, + `reftag` varchar(6) NOT NULL, + `tag` varchar(6) NOT NULL, + `filename` varchar(255) NOT NULL, + `revised` tinyint(1) NOT NULL DEFAULT 0, + `key` varchar(255) NOT NULL, + `target_text` mediumtext NOT NULL, + `source_text` mediumtext NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql-utf8/4.0.3-dev.sql b/component/admin/sql/updates/mysql-utf8/4.0.3-dev.sql new file mode 100644 index 00000000..67c2247f --- /dev/null +++ b/component/admin/sql/updates/mysql-utf8/4.0.3-dev.sql @@ -0,0 +1,12 @@ +CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `client` varchar(255) NOT NULL, + `reftag` varchar(6) NOT NULL, + `tag` varchar(6) NOT NULL, + `filename` varchar(255) NOT NULL, + `revised` tinyint(1) NOT NULL DEFAULT 0, + `key` varchar(255) NOT NULL, + `target_text` mediumtext NOT NULL, + `source_text` mediumtext NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql-utf8/4.0.4-dev.sql b/component/admin/sql/updates/mysql-utf8/4.0.4-dev.sql new file mode 100644 index 00000000..67c2247f --- /dev/null +++ b/component/admin/sql/updates/mysql-utf8/4.0.4-dev.sql @@ -0,0 +1,12 @@ +CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `client` varchar(255) NOT NULL, + `reftag` varchar(6) NOT NULL, + `tag` varchar(6) NOT NULL, + `filename` varchar(255) NOT NULL, + `revised` tinyint(1) NOT NULL DEFAULT 0, + `key` varchar(255) NOT NULL, + `target_text` mediumtext NOT NULL, + `source_text` mediumtext NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql-utf8/4.0.5-dev.sql b/component/admin/sql/updates/mysql-utf8/4.0.5-dev.sql new file mode 100644 index 00000000..67c2247f --- /dev/null +++ b/component/admin/sql/updates/mysql-utf8/4.0.5-dev.sql @@ -0,0 +1,12 @@ +CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `client` varchar(255) NOT NULL, + `reftag` varchar(6) NOT NULL, + `tag` varchar(6) NOT NULL, + `filename` varchar(255) NOT NULL, + `revised` tinyint(1) NOT NULL DEFAULT 0, + `key` varchar(255) NOT NULL, + `target_text` mediumtext NOT NULL, + `source_text` mediumtext NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql-utf8/4.0.6-dev.sql b/component/admin/sql/updates/mysql-utf8/4.0.6-dev.sql new file mode 100644 index 00000000..67c2247f --- /dev/null +++ b/component/admin/sql/updates/mysql-utf8/4.0.6-dev.sql @@ -0,0 +1,12 @@ +CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `client` varchar(255) NOT NULL, + `reftag` varchar(6) NOT NULL, + `tag` varchar(6) NOT NULL, + `filename` varchar(255) NOT NULL, + `revised` tinyint(1) NOT NULL DEFAULT 0, + `key` varchar(255) NOT NULL, + `target_text` mediumtext NOT NULL, + `source_text` mediumtext NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql-utf8/4.0.7-dev.sql b/component/admin/sql/updates/mysql-utf8/4.0.7-dev.sql new file mode 100644 index 00000000..67c2247f --- /dev/null +++ b/component/admin/sql/updates/mysql-utf8/4.0.7-dev.sql @@ -0,0 +1,12 @@ +CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `client` varchar(255) NOT NULL, + `reftag` varchar(6) NOT NULL, + `tag` varchar(6) NOT NULL, + `filename` varchar(255) NOT NULL, + `revised` tinyint(1) NOT NULL DEFAULT 0, + `key` varchar(255) NOT NULL, + `target_text` mediumtext NOT NULL, + `source_text` mediumtext NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql-utf8/4.0.8-dev.sql b/component/admin/sql/updates/mysql-utf8/4.0.8-dev.sql new file mode 100644 index 00000000..67c2247f --- /dev/null +++ b/component/admin/sql/updates/mysql-utf8/4.0.8-dev.sql @@ -0,0 +1,12 @@ +CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `client` varchar(255) NOT NULL, + `reftag` varchar(6) NOT NULL, + `tag` varchar(6) NOT NULL, + `filename` varchar(255) NOT NULL, + `revised` tinyint(1) NOT NULL DEFAULT 0, + `key` varchar(255) NOT NULL, + `target_text` mediumtext NOT NULL, + `source_text` mediumtext NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql-utf8/4.0.9-dev.sql b/component/admin/sql/updates/mysql-utf8/4.0.9-dev.sql new file mode 100644 index 00000000..67c2247f --- /dev/null +++ b/component/admin/sql/updates/mysql-utf8/4.0.9-dev.sql @@ -0,0 +1,12 @@ +CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `client` varchar(255) NOT NULL, + `reftag` varchar(6) NOT NULL, + `tag` varchar(6) NOT NULL, + `filename` varchar(255) NOT NULL, + `revised` tinyint(1) NOT NULL DEFAULT 0, + `key` varchar(255) NOT NULL, + `target_text` mediumtext NOT NULL, + `source_text` mediumtext NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql-utf8/4.0.sql b/component/admin/sql/updates/mysql-utf8/4.0.sql new file mode 100644 index 00000000..67c2247f --- /dev/null +++ b/component/admin/sql/updates/mysql-utf8/4.0.sql @@ -0,0 +1,12 @@ +CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `client` varchar(255) NOT NULL, + `reftag` varchar(6) NOT NULL, + `tag` varchar(6) NOT NULL, + `filename` varchar(255) NOT NULL, + `revised` tinyint(1) NOT NULL DEFAULT 0, + `key` varchar(255) NOT NULL, + `target_text` mediumtext NOT NULL, + `source_text` mediumtext NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql-utf8/index.html b/component/admin/sql/updates/mysql-utf8/index.html new file mode 100644 index 00000000..3af63015 --- /dev/null +++ b/component/admin/sql/updates/mysql-utf8/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/component/admin/sql/updates/mysql/4.0.4-dev.sql b/component/admin/sql/updates/mysql/4.0.4-dev.sql new file mode 100644 index 00000000..67c2247f --- /dev/null +++ b/component/admin/sql/updates/mysql/4.0.4-dev.sql @@ -0,0 +1,12 @@ +CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `client` varchar(255) NOT NULL, + `reftag` varchar(6) NOT NULL, + `tag` varchar(6) NOT NULL, + `filename` varchar(255) NOT NULL, + `revised` tinyint(1) NOT NULL DEFAULT 0, + `key` varchar(255) NOT NULL, + `target_text` mediumtext NOT NULL, + `source_text` mediumtext NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/localise.xml b/localise.xml index 5ee75d43..1054fff0 100644 --- a/localise.xml +++ b/localise.xml @@ -15,20 +15,21 @@ install.php - sql/install/mysql/install.sql - sql/install/mysql/install.sql + sql/install/mysql/install.sql + + sql/install/mysql/install-utf8.sql sql/install/mysql/uninstall.sql - sql/install/mysql/uninstall.sql - sql/updates/mysql - sql/updates/mysql + sql/updates/mysql + + sql/updates/mysql-utf8 From e144b54edf9062e64c7e6fa7b7ebceeb3eaab0e1 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 19 Mar 2016 17:51:38 +0000 Subject: [PATCH 16/26] correct update utf8mb4 --- .../mysql/{install-utf8.sql => install.utf8.sql} | 0 .../mysql/{install.sql => install.utf8mb4.sql} | 0 .../updates/mysql-utf8/{4.0.10-dev.sql => 4.0.0.sql} | 0 .../admin/sql/updates/mysql-utf8/4.0.12-dev.sql | 12 ------------ .../4.0.14.sql => mysql-utf8/4.0.14-dev-utf8mb4.sql} | 0 component/admin/sql/updates/mysql-utf8/4.0.3-dev.sql | 12 ------------ component/admin/sql/updates/mysql-utf8/4.0.4-dev.sql | 12 ------------ component/admin/sql/updates/mysql-utf8/4.0.5-dev.sql | 12 ------------ component/admin/sql/updates/mysql-utf8/4.0.6-dev.sql | 12 ------------ component/admin/sql/updates/mysql-utf8/4.0.7-dev.sql | 12 ------------ component/admin/sql/updates/mysql-utf8/4.0.8-dev.sql | 12 ------------ component/admin/sql/updates/mysql-utf8/4.0.9-dev.sql | 12 ------------ component/admin/sql/updates/mysql-utf8/4.0.sql | 12 ------------ .../{mysql-utf8/4.0.11-dev.sql => mysql/4.0.0.sql} | 0 component/admin/sql/updates/mysql/4.0.10-dev.sql | 12 ------------ component/admin/sql/updates/mysql/4.0.11-dev.sql | 12 ------------ component/admin/sql/updates/mysql/4.0.12-dev.sql | 12 ------------ component/admin/sql/updates/mysql/4.0.3-dev.sql | 12 ------------ component/admin/sql/updates/mysql/4.0.4-dev.sql | 12 ------------ component/admin/sql/updates/mysql/4.0.5-dev.sql | 12 ------------ component/admin/sql/updates/mysql/4.0.6-dev.sql | 12 ------------ component/admin/sql/updates/mysql/4.0.7-dev.sql | 12 ------------ component/admin/sql/updates/mysql/4.0.8-dev.sql | 12 ------------ component/admin/sql/updates/mysql/4.0.9-dev.sql | 12 ------------ component/admin/sql/updates/mysql/4.0.sql | 12 ------------ localise.xml | 10 ++++------ 26 files changed, 4 insertions(+), 246 deletions(-) rename component/admin/sql/install/mysql/{install-utf8.sql => install.utf8.sql} (100%) rename component/admin/sql/install/mysql/{install.sql => install.utf8mb4.sql} (100%) rename component/admin/sql/updates/mysql-utf8/{4.0.10-dev.sql => 4.0.0.sql} (100%) delete mode 100644 component/admin/sql/updates/mysql-utf8/4.0.12-dev.sql rename component/admin/sql/updates/{mysql/4.0.14.sql => mysql-utf8/4.0.14-dev-utf8mb4.sql} (100%) delete mode 100644 component/admin/sql/updates/mysql-utf8/4.0.3-dev.sql delete mode 100644 component/admin/sql/updates/mysql-utf8/4.0.4-dev.sql delete mode 100644 component/admin/sql/updates/mysql-utf8/4.0.5-dev.sql delete mode 100644 component/admin/sql/updates/mysql-utf8/4.0.6-dev.sql delete mode 100644 component/admin/sql/updates/mysql-utf8/4.0.7-dev.sql delete mode 100644 component/admin/sql/updates/mysql-utf8/4.0.8-dev.sql delete mode 100644 component/admin/sql/updates/mysql-utf8/4.0.9-dev.sql delete mode 100644 component/admin/sql/updates/mysql-utf8/4.0.sql rename component/admin/sql/updates/{mysql-utf8/4.0.11-dev.sql => mysql/4.0.0.sql} (100%) delete mode 100644 component/admin/sql/updates/mysql/4.0.10-dev.sql delete mode 100644 component/admin/sql/updates/mysql/4.0.11-dev.sql delete mode 100644 component/admin/sql/updates/mysql/4.0.12-dev.sql delete mode 100644 component/admin/sql/updates/mysql/4.0.3-dev.sql delete mode 100644 component/admin/sql/updates/mysql/4.0.4-dev.sql delete mode 100644 component/admin/sql/updates/mysql/4.0.5-dev.sql delete mode 100644 component/admin/sql/updates/mysql/4.0.6-dev.sql delete mode 100644 component/admin/sql/updates/mysql/4.0.7-dev.sql delete mode 100644 component/admin/sql/updates/mysql/4.0.8-dev.sql delete mode 100644 component/admin/sql/updates/mysql/4.0.9-dev.sql delete mode 100644 component/admin/sql/updates/mysql/4.0.sql diff --git a/component/admin/sql/install/mysql/install-utf8.sql b/component/admin/sql/install/mysql/install.utf8.sql similarity index 100% rename from component/admin/sql/install/mysql/install-utf8.sql rename to component/admin/sql/install/mysql/install.utf8.sql diff --git a/component/admin/sql/install/mysql/install.sql b/component/admin/sql/install/mysql/install.utf8mb4.sql similarity index 100% rename from component/admin/sql/install/mysql/install.sql rename to component/admin/sql/install/mysql/install.utf8mb4.sql diff --git a/component/admin/sql/updates/mysql-utf8/4.0.10-dev.sql b/component/admin/sql/updates/mysql-utf8/4.0.0.sql similarity index 100% rename from component/admin/sql/updates/mysql-utf8/4.0.10-dev.sql rename to component/admin/sql/updates/mysql-utf8/4.0.0.sql diff --git a/component/admin/sql/updates/mysql-utf8/4.0.12-dev.sql b/component/admin/sql/updates/mysql-utf8/4.0.12-dev.sql deleted file mode 100644 index 67c2247f..00000000 --- a/component/admin/sql/updates/mysql-utf8/4.0.12-dev.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql/4.0.14.sql b/component/admin/sql/updates/mysql-utf8/4.0.14-dev-utf8mb4.sql similarity index 100% rename from component/admin/sql/updates/mysql/4.0.14.sql rename to component/admin/sql/updates/mysql-utf8/4.0.14-dev-utf8mb4.sql diff --git a/component/admin/sql/updates/mysql-utf8/4.0.3-dev.sql b/component/admin/sql/updates/mysql-utf8/4.0.3-dev.sql deleted file mode 100644 index 67c2247f..00000000 --- a/component/admin/sql/updates/mysql-utf8/4.0.3-dev.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql-utf8/4.0.4-dev.sql b/component/admin/sql/updates/mysql-utf8/4.0.4-dev.sql deleted file mode 100644 index 67c2247f..00000000 --- a/component/admin/sql/updates/mysql-utf8/4.0.4-dev.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql-utf8/4.0.5-dev.sql b/component/admin/sql/updates/mysql-utf8/4.0.5-dev.sql deleted file mode 100644 index 67c2247f..00000000 --- a/component/admin/sql/updates/mysql-utf8/4.0.5-dev.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql-utf8/4.0.6-dev.sql b/component/admin/sql/updates/mysql-utf8/4.0.6-dev.sql deleted file mode 100644 index 67c2247f..00000000 --- a/component/admin/sql/updates/mysql-utf8/4.0.6-dev.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql-utf8/4.0.7-dev.sql b/component/admin/sql/updates/mysql-utf8/4.0.7-dev.sql deleted file mode 100644 index 67c2247f..00000000 --- a/component/admin/sql/updates/mysql-utf8/4.0.7-dev.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql-utf8/4.0.8-dev.sql b/component/admin/sql/updates/mysql-utf8/4.0.8-dev.sql deleted file mode 100644 index 67c2247f..00000000 --- a/component/admin/sql/updates/mysql-utf8/4.0.8-dev.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql-utf8/4.0.9-dev.sql b/component/admin/sql/updates/mysql-utf8/4.0.9-dev.sql deleted file mode 100644 index 67c2247f..00000000 --- a/component/admin/sql/updates/mysql-utf8/4.0.9-dev.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql-utf8/4.0.sql b/component/admin/sql/updates/mysql-utf8/4.0.sql deleted file mode 100644 index 67c2247f..00000000 --- a/component/admin/sql/updates/mysql-utf8/4.0.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql-utf8/4.0.11-dev.sql b/component/admin/sql/updates/mysql/4.0.0.sql similarity index 100% rename from component/admin/sql/updates/mysql-utf8/4.0.11-dev.sql rename to component/admin/sql/updates/mysql/4.0.0.sql diff --git a/component/admin/sql/updates/mysql/4.0.10-dev.sql b/component/admin/sql/updates/mysql/4.0.10-dev.sql deleted file mode 100644 index 67c2247f..00000000 --- a/component/admin/sql/updates/mysql/4.0.10-dev.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql/4.0.11-dev.sql b/component/admin/sql/updates/mysql/4.0.11-dev.sql deleted file mode 100644 index 67c2247f..00000000 --- a/component/admin/sql/updates/mysql/4.0.11-dev.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql/4.0.12-dev.sql b/component/admin/sql/updates/mysql/4.0.12-dev.sql deleted file mode 100644 index 67c2247f..00000000 --- a/component/admin/sql/updates/mysql/4.0.12-dev.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql/4.0.3-dev.sql b/component/admin/sql/updates/mysql/4.0.3-dev.sql deleted file mode 100644 index 67c2247f..00000000 --- a/component/admin/sql/updates/mysql/4.0.3-dev.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql/4.0.4-dev.sql b/component/admin/sql/updates/mysql/4.0.4-dev.sql deleted file mode 100644 index 67c2247f..00000000 --- a/component/admin/sql/updates/mysql/4.0.4-dev.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql/4.0.5-dev.sql b/component/admin/sql/updates/mysql/4.0.5-dev.sql deleted file mode 100644 index 67c2247f..00000000 --- a/component/admin/sql/updates/mysql/4.0.5-dev.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql/4.0.6-dev.sql b/component/admin/sql/updates/mysql/4.0.6-dev.sql deleted file mode 100644 index 67c2247f..00000000 --- a/component/admin/sql/updates/mysql/4.0.6-dev.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql/4.0.7-dev.sql b/component/admin/sql/updates/mysql/4.0.7-dev.sql deleted file mode 100644 index 67c2247f..00000000 --- a/component/admin/sql/updates/mysql/4.0.7-dev.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql/4.0.8-dev.sql b/component/admin/sql/updates/mysql/4.0.8-dev.sql deleted file mode 100644 index 67c2247f..00000000 --- a/component/admin/sql/updates/mysql/4.0.8-dev.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql/4.0.9-dev.sql b/component/admin/sql/updates/mysql/4.0.9-dev.sql deleted file mode 100644 index 67c2247f..00000000 --- a/component/admin/sql/updates/mysql/4.0.9-dev.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql/4.0.sql b/component/admin/sql/updates/mysql/4.0.sql deleted file mode 100644 index 67c2247f..00000000 --- a/component/admin/sql/updates/mysql/4.0.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/localise.xml b/localise.xml index 1054fff0..a4a0d6dc 100644 --- a/localise.xml +++ b/localise.xml @@ -15,9 +15,8 @@ install.php - sql/install/mysql/install.sql - - sql/install/mysql/install-utf8.sql + sql/install/mysql/install.utf8.sql + sql/install/mysql/install.utf8mb4.sql @@ -27,9 +26,8 @@ - sql/updates/mysql - - sql/updates/mysql-utf8 + sql/updates/mysql + sql/updates/mysql-utf8mb4 From 9edc11cca005ce8ecaa43615b6dc572ea361e128 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 19 Mar 2016 19:19:20 +0000 Subject: [PATCH 17/26] corrections --- .../updates/{mysql-utf8 => mysql-utf8mb4}/0.0.1.sql | 0 .../4.0.15.sql} | 13 +++++++++++++ .../{mysql-utf8 => mysql-utf8mb4}/index.html | 0 component/admin/sql/updates/mysql/4.0.0.sql | 12 ------------ .../{mysql-utf8/4.0.0.sql => mysql/4.0.15.sql} | 0 localise.xml | 2 +- 6 files changed, 14 insertions(+), 13 deletions(-) rename component/admin/sql/updates/{mysql-utf8 => mysql-utf8mb4}/0.0.1.sql (100%) rename component/admin/sql/updates/{mysql-utf8/4.0.14-dev-utf8mb4.sql => mysql-utf8mb4/4.0.15.sql} (73%) rename component/admin/sql/updates/{mysql-utf8 => mysql-utf8mb4}/index.html (100%) delete mode 100644 component/admin/sql/updates/mysql/4.0.0.sql rename component/admin/sql/updates/{mysql-utf8/4.0.0.sql => mysql/4.0.15.sql} (100%) diff --git a/component/admin/sql/updates/mysql-utf8/0.0.1.sql b/component/admin/sql/updates/mysql-utf8mb4/0.0.1.sql similarity index 100% rename from component/admin/sql/updates/mysql-utf8/0.0.1.sql rename to component/admin/sql/updates/mysql-utf8mb4/0.0.1.sql diff --git a/component/admin/sql/updates/mysql-utf8/4.0.14-dev-utf8mb4.sql b/component/admin/sql/updates/mysql-utf8mb4/4.0.15.sql similarity index 73% rename from component/admin/sql/updates/mysql-utf8/4.0.14-dev-utf8mb4.sql rename to component/admin/sql/updates/mysql-utf8mb4/4.0.15.sql index 60119614..cfd0c865 100644 --- a/component/admin/sql/updates/mysql-utf8/4.0.14-dev-utf8mb4.sql +++ b/component/admin/sql/updates/mysql-utf8mb4/4.0.15.sql @@ -1,3 +1,16 @@ +CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `client` varchar(255) NOT NULL, + `reftag` varchar(6) NOT NULL, + `tag` varchar(6) NOT NULL, + `filename` varchar(255) NOT NULL, + `revised` tinyint(1) NOT NULL DEFAULT 0, + `key` varchar(255) NOT NULL, + `target_text` mediumtext NOT NULL, + `source_text` mediumtext NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + -- Step 1 of the UTF-8 Multibyte (utf8mb4) conversion for MySQL. -- Drop indexes which will be added again in step 2. ALTER TABLE `#__localise` DROP KEY `idx_path`; diff --git a/component/admin/sql/updates/mysql-utf8/index.html b/component/admin/sql/updates/mysql-utf8mb4/index.html similarity index 100% rename from component/admin/sql/updates/mysql-utf8/index.html rename to component/admin/sql/updates/mysql-utf8mb4/index.html diff --git a/component/admin/sql/updates/mysql/4.0.0.sql b/component/admin/sql/updates/mysql/4.0.0.sql deleted file mode 100644 index 67c2247f..00000000 --- a/component/admin/sql/updates/mysql/4.0.0.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/component/admin/sql/updates/mysql-utf8/4.0.0.sql b/component/admin/sql/updates/mysql/4.0.15.sql similarity index 100% rename from component/admin/sql/updates/mysql-utf8/4.0.0.sql rename to component/admin/sql/updates/mysql/4.0.15.sql diff --git a/localise.xml b/localise.xml index a4a0d6dc..9318046d 100644 --- a/localise.xml +++ b/localise.xml @@ -9,7 +9,7 @@ (C) 2015 Open Source Matters. All rights reserved. admin@joomla.org https://github.com/joomla-projects/com_localise - 4.0.14-dev + 4.0.16 http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL COM_LOCALISE_XML_DESCRIPTION install.php From 839c91ba64193d744d3f12bb7ab44113956f3fd8 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 19 Mar 2016 19:23:49 +0000 Subject: [PATCH 18/26] 4.0.15 --- localise.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localise.xml b/localise.xml index 9318046d..baa18d6c 100644 --- a/localise.xml +++ b/localise.xml @@ -9,7 +9,7 @@ (C) 2015 Open Source Matters. All rights reserved. admin@joomla.org https://github.com/joomla-projects/com_localise - 4.0.16 + 4.0.15-dev http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL COM_LOCALISE_XML_DESCRIPTION install.php From c86530314826090a57583863b55f701e37e7e88a Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 19 Mar 2016 20:30:26 +0000 Subject: [PATCH 19/26] explain in comments how the utf8/utf8mb4 sql scripts runs --- localise.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/localise.xml b/localise.xml index baa18d6c..70adcf8e 100644 --- a/localise.xml +++ b/localise.xml @@ -15,17 +15,32 @@ install.php + sql/install/mysql/install.utf8.sql sql/install/mysql/install.utf8mb4.sql + sql/install/mysql/uninstall.sql + sql/updates/mysql sql/updates/mysql-utf8mb4 From d471500197d4470a7fa6465808a802d3d93d5061 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 19 Mar 2016 20:33:04 +0000 Subject: [PATCH 20/26] optimize comments --- localise.xml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/localise.xml b/localise.xml index 70adcf8e..9966e1ae 100644 --- a/localise.xml +++ b/localise.xml @@ -16,10 +16,8 @@ sql/install/mysql/install.utf8.sql sql/install/mysql/install.utf8mb4.sql @@ -37,9 +35,8 @@ sql/updates/mysql sql/updates/mysql-utf8mb4 From 99e49b553d1d5807353cdaf91f7a82d49f92ee69 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 19 Mar 2016 20:38:14 +0000 Subject: [PATCH 21/26] file, not schemepath --- localise.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localise.xml b/localise.xml index 9966e1ae..882b0fbe 100644 --- a/localise.xml +++ b/localise.xml @@ -17,7 +17,7 @@ sql/install/mysql/install.utf8.sql sql/install/mysql/install.utf8mb4.sql From 6df03732e524b3f80d30bde9d34fd1f5e9b2559b Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 19 Mar 2016 20:40:56 +0000 Subject: [PATCH 22/26] better comment --- localise.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/localise.xml b/localise.xml index 882b0fbe..c1e0e4ca 100644 --- a/localise.xml +++ b/localise.xml @@ -17,7 +17,7 @@ sql/install/mysql/install.utf8.sql sql/install/mysql/install.utf8mb4.sql @@ -26,7 +26,7 @@ sql/install/mysql/uninstall.sql @@ -35,8 +35,8 @@ sql/updates/mysql sql/updates/mysql-utf8mb4 From fd79cb3d5575be7b14e132026f60fbd2717b1ef6 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 19 Mar 2016 20:41:56 +0000 Subject: [PATCH 23/26] copy/paste type --- localise.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localise.xml b/localise.xml index c1e0e4ca..1e91d0a6 100644 --- a/localise.xml +++ b/localise.xml @@ -35,7 +35,7 @@ sql/updates/mysql From ac3ba86401396142cf87c11a1bba8ae7b46cb470 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sun, 20 Mar 2016 12:11:36 +0000 Subject: [PATCH 24/26] improve comments and change year to 2016 --- localise.xml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/localise.xml b/localise.xml index e86ffc50..90e4b3f1 100644 --- a/localise.xml +++ b/localise.xml @@ -6,7 +6,7 @@ Christophe Demko Jean-Marie Simonet Ifan Evans - (C) 2015 Open Source Matters. All rights reserved. + (C) 2016 Open Source Matters. All rights reserved. admin@joomla.org https://github.com/joomla-projects/com_localise 4.0.15-dev @@ -16,8 +16,8 @@ sql/install/mysql/install.sql sql/install/mysql/install.utf8mb4.sql @@ -25,17 +25,15 @@ - + sql/install/mysql/uninstall.sql sql/updates/mysql From b40932bf0e6aa78f2ebc8488fc79a6338d6d48f5 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sun, 20 Mar 2016 12:13:01 +0000 Subject: [PATCH 25/26] adjust --- localise.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localise.xml b/localise.xml index 90e4b3f1..05f28b7d 100644 --- a/localise.xml +++ b/localise.xml @@ -17,7 +17,7 @@ sql/install/mysql/install.sql sql/install/mysql/install.utf8mb4.sql From 71c1e02e3daf6a1a662bc030f8e877aa2261fedb Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sun, 20 Mar 2016 14:50:28 +0000 Subject: [PATCH 26/26] use dates in sql update files like the core does --- .../4.0.15-2016-03-16.sql} | 0 .../{4.0.15.sql => 4.0.15-2016-03-20.sql} | 13 ------------- .../admin/sql/updates/mysql/4.0.15-2016-03-16.sql | 12 ++++++++++++ 3 files changed, 12 insertions(+), 13 deletions(-) rename component/admin/sql/updates/{mysql/4.0.15.sql => mysql-utf8mb4/4.0.15-2016-03-16.sql} (100%) rename component/admin/sql/updates/mysql-utf8mb4/{4.0.15.sql => 4.0.15-2016-03-20.sql} (73%) create mode 100644 component/admin/sql/updates/mysql/4.0.15-2016-03-16.sql diff --git a/component/admin/sql/updates/mysql/4.0.15.sql b/component/admin/sql/updates/mysql-utf8mb4/4.0.15-2016-03-16.sql similarity index 100% rename from component/admin/sql/updates/mysql/4.0.15.sql rename to component/admin/sql/updates/mysql-utf8mb4/4.0.15-2016-03-16.sql diff --git a/component/admin/sql/updates/mysql-utf8mb4/4.0.15.sql b/component/admin/sql/updates/mysql-utf8mb4/4.0.15-2016-03-20.sql similarity index 73% rename from component/admin/sql/updates/mysql-utf8mb4/4.0.15.sql rename to component/admin/sql/updates/mysql-utf8mb4/4.0.15-2016-03-20.sql index cfd0c865..60119614 100644 --- a/component/admin/sql/updates/mysql-utf8mb4/4.0.15.sql +++ b/component/admin/sql/updates/mysql-utf8mb4/4.0.15-2016-03-20.sql @@ -1,16 +1,3 @@ -CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `client` varchar(255) NOT NULL, - `reftag` varchar(6) NOT NULL, - `tag` varchar(6) NOT NULL, - `filename` varchar(255) NOT NULL, - `revised` tinyint(1) NOT NULL DEFAULT 0, - `key` varchar(255) NOT NULL, - `target_text` mediumtext NOT NULL, - `source_text` mediumtext NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -- Step 1 of the UTF-8 Multibyte (utf8mb4) conversion for MySQL. -- Drop indexes which will be added again in step 2. ALTER TABLE `#__localise` DROP KEY `idx_path`; diff --git a/component/admin/sql/updates/mysql/4.0.15-2016-03-16.sql b/component/admin/sql/updates/mysql/4.0.15-2016-03-16.sql new file mode 100644 index 00000000..67c2247f --- /dev/null +++ b/component/admin/sql/updates/mysql/4.0.15-2016-03-16.sql @@ -0,0 +1,12 @@ +CREATE TABLE IF NOT EXISTS `#__localise_revised_values` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `client` varchar(255) NOT NULL, + `reftag` varchar(6) NOT NULL, + `tag` varchar(6) NOT NULL, + `filename` varchar(255) NOT NULL, + `revised` tinyint(1) NOT NULL DEFAULT 0, + `key` varchar(255) NOT NULL, + `target_text` mediumtext NOT NULL, + `source_text` mediumtext NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8;