Skip to content
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

Jump to bottom

Suggested changes to your joomla-cms PR 4872 #3

Merged
merged 4 commits into from
Nov 19, 2015
Merged

Suggested changes to your joomla-cms PR 4872 #3

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
1702d42
Eliminate duplicated sql statements
zjw Nov 19, 2015
bf0323e
Don't attempt to process blank lines & comments
zjw Nov 19, 2015
1b3c708
Eliminate schema differences between updating and a fresh install
zjw Nov 19, 2015
a564302
Perform utf8mb4 conversion for pdomysql as well
zjw Nov 19, 2015
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
37 changes: 27 additions & 10 deletions administrator/components/com_admin/script.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1583,7 +1583,7 @@ private function updateUtf8Mb4()
// Setup the adapter for the indexer.
$format = $db->name;

if ($format == 'mysqli')
if ($format == 'mysqli' || $format == 'pdomysql')
{
$format = 'mysql';
}
Expand All @@ -1596,21 +1596,34 @@ private function updateUtf8Mb4()
$fileContents = @file_get_contents($fileName);
$queries = $db->splitSql($fileContents);

if (count($queries) == 0)
{
// No queries to process
return;
}

$utf8mb4IsSupported = $this->serverClaimsUtf8mb4Support($db->name);

// Execute the queries
foreach ($queries as $query)
{
try
$query = trim($query);

if ($query != '' && $query{0} != '#')
{
if (!$this->serverClaimsUtf8mb4Support($db->name))
try
{
$query = str_replace('utf8mb4', 'utf8', $query);
}
if (!utf8mb4IsSupported)
{
$query = str_replace('utf8mb4', 'utf8', $query);
}

$db->setQuery($query)->execute();
}
catch (RuntimeException $e)
{
JFactory::getApplication()->enqueueMessage(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $e->getCode(), $e->getMessage()));
$db->setQuery($query)->execute();
}
catch (RuntimeException $e)
{
JFactory::getApplication()->enqueueMessage(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $e->getCode(), $e->getMessage()));
}
}
}
}
Expand Down Expand Up @@ -1641,6 +1654,10 @@ private function serverClaimsUtf8mb4Support($format)
$client_version = mysqli_get_client_info();
$server_version = $db->getVersion();
break;
case 'pdomysql';
$client_version = $db->getOption(PDO::ATTR_CLIENT_VERSION);
$server_version = $db->getOption(PDO::ATTR_SERVER_VERSION);
break;
default:
$client_version = false;
}
Expand Down
10 changes: 4 additions & 6 deletions administrator/components/com_admin/sql/utf8mb4/mysql/3.5.0-2015-07-01.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ ALTER TABLE `#__menu` DROP KEY `idx_client_id_parent_id_alias_language`, ADD UNI

ALTER TABLE `#__redirect_links` DROP KEY `idx_link_old`, ADD UNIQUE KEY `idx_link_old` (`old_url`(191));

ALTER TABLE `#__menu` DROP KEY `idx_path`, ADD KEY `idx_path` (`path`(191));

ALTER TABLE `#__session` MODIFY `session_id` varchar(191) NOT NULL DEFAULT '';

ALTER TABLE `#__user_keys` MODIFY `series` varchar(191) NOT NULL;
Expand Down Expand Up @@ -119,7 +121,7 @@ ALTER TABLE `#__finder_filters` CHANGE COLUMN `data` `data` TEXT NOT NULL;
ALTER TABLE `#__finder_filters` CHANGE COLUMN `params` `params` MEDIUMTEXT;
ALTER TABLE `#__languages` CHANGE COLUMN `metakey` `metakey` TEXT NOT NULL;
ALTER TABLE `#__languages` CHANGE COLUMN `metadesc` `metadesc` TEXT NOT NULL;
ALTER TABLE `#__menu` CHANGE COLUMN `params` `params` TEXT NOT NULL;
ALTER TABLE `#__menu` CHANGE COLUMN `params` `params` TEXT NOT NULL COMMENT 'JSON encoded data for the menu item.';
ALTER TABLE `#__messages` CHANGE COLUMN `message` `message` TEXT NOT NULL;
ALTER TABLE `#__modules` CHANGE COLUMN `content` `content` TEXT NOT NULL;
ALTER TABLE `#__modules` CHANGE COLUMN `params` `params` TEXT NOT NULL;
Expand All @@ -130,7 +132,7 @@ ALTER TABLE `#__newsfeeds` CHANGE COLUMN `metadata` `metadata` TEXT NOT NULL;
ALTER TABLE `#__newsfeeds` CHANGE COLUMN `description` `description` TEXT NOT NULL;
ALTER TABLE `#__newsfeeds` CHANGE COLUMN `images` `images` TEXT NOT NULL;
ALTER TABLE `#__overrider` CHANGE COLUMN `string` `string` TEXT NOT NULL;
ALTER TABLE `#__session` CHANGE COLUMN `data` `data` MEDIUMTEXT NOT NULL;
ALTER TABLE `#__session` CHANGE COLUMN `data` `data` MEDIUMTEXT;
ALTER TABLE `#__tags` CHANGE COLUMN `description` `description` MEDIUMTEXT NOT NULL;
ALTER TABLE `#__tags` CHANGE COLUMN `params` `params` TEXT NOT NULL;
ALTER TABLE `#__tags` CHANGE COLUMN `images` `images` TEXT NOT NULL;
Expand All @@ -151,7 +153,3 @@ ALTER TABLE `#__update_sites` CHANGE COLUMN `location` `location` TEXT NOT NULL;
ALTER TABLE `#__users` CHANGE COLUMN `params` `params` TEXT NOT NULL;
ALTER TABLE `#__user_notes` CHANGE COLUMN `body` `body` TEXT NOT NULL;
ALTER TABLE `#__user_profiles` CHANGE COLUMN `profile_value` `profile_value` TEXT NOT NULL;

-- Drop obsolete indexes
ALTER TABLE `#__contentitem_tag_map` DROP INDEX `idx_tag`;
ALTER TABLE `#__contentitem_tag_map` DROP INDEX `idx_type`;