Skip to content

Make extension installer handle sql files for utf8mb4 or utf8 #9468

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

Closed
richard67 wants to merge 5 commits into from
Closed

Make extension installer handle sql files for utf8mb4 or utf8 #9468

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e7e99c9
Make installer handle files for utf8mb4 or utf8
richard67 Mar 18, 2016
95b159d
Correct silly copy paste error
richard67 Mar 18, 2016
5453008
Forgotten to remove old stuff, thanks Andre
richard67 Mar 18, 2016
2d1b2b3
Correct charset substitution
richard67 Mar 18, 2016
d599085
Another silly copy paste error
richard67 Mar 18, 2016
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
112 changes: 107 additions & 5 deletions libraries/cms/installer/installer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,8 +911,10 @@ public function parseSQLFiles($element)
$queries = array();
$db = & $this->_db;
$dbDriver = strtolower($db->name);
$dbUtf8mb4Support = $this->serverClaimsUtf8mb4Support($dbDriver);
$useCharset = $dbUtf8mb4Support ? 'utf8mb4' : 'utf8';

$doUtf8mb4ToUtf8 = !$this->serverClaimsUtf8mb4Support($dbDriver);
$doUtf8mb4ToUtf8 = !$dbUtf8mb4Support;

if ($dbDriver == 'mysqli' || $dbDriver == 'pdomysql')
{
Expand All @@ -922,22 +924,69 @@ public function parseSQLFiles($element)
if ($dbDriver != 'mysql')
{
$doUtf8mb4ToUtf8 = false;
$useCharset = 'utf8';
}

/*
* For mysql related drivers check first for which of the character sets
* utf8mb4 or utf8 a file is avalibale. If for both, use the appropriate one
* but do query downgrade if neccesary just to be on the safer side, and if
* only one of the 2 is specified, use that one, also with query downgrade.
*/
if ($dbDriver == 'mysql')
{
$utf8mb4Found = false;
$utf8Found = false;

foreach ($element->children() as $file1)
{
$fDriver = strtolower($file1->attributes()->driver);

if ($fDriver == 'mysql' || $fDriver == 'mysqli' || $fDriver == 'pdomysql')
{
$fCharset = strtolower($file1->attributes()->charset);

if ($fCharset == 'utf8mb4')
{
$utf8mb4Found = true;
}
elseif ($fCharset == 'utf8')
{
$utf8Found = true;
}
}
}

if ($useCharset == 'utf8mb4')
{
if (!$utf8mb4Found && $utf8Found)
{
$useCharset = 'utf8';
}
}
else
{
if (!$utf8Found && $utf8mb4Found)
{
$useCharset = 'utf8mb4';
}
}
}

$update_count = 0;

// Get the name of the sql file to process
foreach ($element->children() as $file)
{
$fCharset = (strtolower($file->attributes()->charset) == 'utf8') ? 'utf8' : '';
$fCharset = strtolower($file->attributes()->charset);
$fDriver = strtolower($file->attributes()->driver);

if ($fDriver == 'mysqli' || $fDriver == 'pdomysql')
{
$fDriver = 'mysql';
}

if ($fCharset == 'utf8' && $fDriver == $dbDriver)
if ($fCharset == $useCharset && $fDriver == $dbDriver)
{
$sqlfile = $this->getPath('extension_root') . '/' . trim($file);

Expand Down Expand Up @@ -1086,8 +1135,10 @@ public function parseSchemaUpdates(SimpleXMLElement $schema, $eid)
if (count($schemapaths))
{
$dbDriver = strtolower($db->name);
$dbUtf8mb4Support = $this->serverClaimsUtf8mb4Support($dbDriver);
$useCharset = $dbUtf8mb4Support ? 'utf8mb4' : 'utf8';

$doUtf8mb4ToUtf8 = !$this->serverClaimsUtf8mb4Support($dbDriver);
$doUtf8mb4ToUtf8 = !$dbUtf8mb4Support;

if ($dbDriver == 'mysqli' || $dbDriver == 'pdomysql')
{
Expand All @@ -1097,6 +1148,55 @@ public function parseSchemaUpdates(SimpleXMLElement $schema, $eid)
if ($dbDriver != 'mysql')
{
$doUtf8mb4ToUtf8 = false;
$useCharset = 'utf8';
}

/*
* For mysql related drivers check first for which of the character sets
* utf8mb4 or utf8 a file is avalibale. If for both, use the appropriate one
* but do query downgrade if neccesary just to be on the safer side, and if
* only one of the 2 is specified, use that one, also with query downgrade.
*/
if ($dbDriver == 'mysql')
{
$utf8mb4Found = false;
$utf8Found = false;

foreach ($schemapaths as $entry1)
{
$attrs = $entry1->attributes();

$uDriver = strtolower($attrs['type']);

if ($uDriver == 'mysql' || $uDriver == 'mysqli' || $uDriver == 'pdomysql')
{
$uCharset = isset($attrs['charset']) ? strtolower($attrs['charset']) : 'utf8';

if ($uCharset == 'utf8mb4')
{
$utf8mb4Found = true;
}
elseif ($uCharset == 'utf8')
{
$utf8Found = true;
}
}
}

if ($useCharset == 'utf8mb4')
{
if (!$utf8mb4Found && $utf8Found)
{
$useCharset = 'utf8';
}
}
else
{
if (!$utf8Found && $utf8mb4Found)
{
$useCharset = 'utf8mb4';
}
}
}

$schemapath = '';
Expand All @@ -1113,7 +1213,9 @@ public function parseSchemaUpdates(SimpleXMLElement $schema, $eid)
$uDriver = 'mysql';
}

if ($uDriver == $dbDriver)
$uCharset = isset($attrs['charset']) ? strtolower($attrs['charset']) : 'utf8';

if ($uCharset == $useCharset && $uDriver == $dbDriver)
{
$schemapath = $entry;
break;
Expand Down