Skip to content

[3.x] Fix incomplete utf8mb4 conversion since 3.9.17 (only MySQL and MariaDB databases) #29117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HLeithner merged 4 commits into from
May 26, 2020
Merged

[3.x] Fix incomplete utf8mb4 conversion since 3.9.17 (only MySQL and MariaDB databases) #29117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f1c03b
Fix missing utf8mb4 conversions since 3.9.17
richard67 May 11, 2020
14d176b
Fix installation database model and schema changeset
richard67 May 11, 2020
fac8f96
Fix setting final conversion status in script
richard67 May 11, 2020
037a6f1
Add a schema update to add back possibly lost default value
richard67 May 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions administrator/components/com_admin/script.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2464,11 +2464,17 @@ public function convertTablesToUtf8mb4($doDbFixMsg = false)
{
$convertedStep1 = 2;
$convertedStep2 = 4;

// The first step has to be repeated if it has not been run (converted = 4 in database)
$convertedRequired = 5;
}
else
{
$convertedStep1 = 1;
$convertedStep2 = 3;

// All done after step 2
$convertedRequired = 3;
}

// Check conversion status in database
Expand All @@ -2495,7 +2501,7 @@ public function convertTablesToUtf8mb4($doDbFixMsg = false)
}

// Nothing to do, saved conversion status from DB is equal to required final status
if ($convertedDB == $convertedStep2)
if ($convertedDB == $convertedRequired)
{
return;
}
Expand All @@ -2504,7 +2510,7 @@ public function convertTablesToUtf8mb4($doDbFixMsg = false)
$hasErrors = false;

// Steps 1 and 2: Convert core tables if necessary and not to be done at later steps
if ($convertedDB < $convertedStep1)
if ($convertedDB < $convertedStep1 || ($convertedRequired == 5 && ($convertedDB == 3 || $convertedDB == 4)))
{
// Step 1: Drop indexes later to be added again with column lengths limitations at step 2
$fileName1 = JPATH_ROOT . '/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql';
Expand Down Expand Up @@ -2591,11 +2597,11 @@ public function convertTablesToUtf8mb4($doDbFixMsg = false)
}
}
}
}

if (!$hasErrors)
{
$converted = $convertedStep2;
}
if (!$hasErrors)
{
$converted = $convertedRequired;
}

if ($doDbFixMsg && $hasErrors)
Expand Down
2 changes: 2 additions & 0 deletions administrator/components/com_admin/sql/updates/mysql/3.9.19-2020-05-16.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- Add back the default value which might have been lost with utf8mb4 conversion on certain CMS versions
ALTER TABLE `#__ucm_content` MODIFY `core_title` varchar(400) NOT NULL DEFAULT '';
2 changes: 1 addition & 1 deletion installation/model/database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ public function createTables($options)
{
$query->clear()
->update($db->quoteName('#__utf8_conversion'))
->set($db->quoteName('converted') . ' = ' . ($db->hasUTF8mb4Support() ? 4 : 3));
->set($db->quoteName('converted') . ' = ' . ($db->hasUTF8mb4Support() ? 5 : 3));
$db->setQuery($query);

try
Expand Down
2 changes: 1 addition & 1 deletion libraries/src/Schema/ChangeSet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public function __construct($db, $folder = null)
// Set the check query
if ($this->db->hasUTF8mb4Support())
{
$converted = 4;
$converted = 5;
$tmpSchemaChangeItem->queryType = 'UTF8_CONVERSION_UTF8MB4';
}
else
Expand Down