UTF-8 Multibyte (utf8mb4) support

When utf8mb4 is not supported do not run the CONVERT TO CHARACTER SET database queries (they have no effect, just waste time)
joomla · Jun 13, 2015 · fa7d82d · fa7d82d
1 parent 73b7f87
commit fa7d82d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/installation/model/database.php b/installation/model/database.php
@@ -904,6 +904,15 @@ public function populateDatabase($db, $schema)
 				 */
 				$query = $db->convertUtf8mb4QueryToUtf8($query);
 
+				/**
+				 * This is a query which was supposed to convert tables to utf8mb4 charset but the server doesn't
+				 * support utf8mb4. Therefore we don't have to run it, it has no effect and it's a mere waste of time.
+				 */
+				if (!$db->hasUTF8mb4Support() && stristr($query, 'CONVERT TO CHARACTER SET utf8 '))
+				{
+					continue;
+				}
+
 				// Execute the query.
 				$db->setQuery($query);
 

diff --git a/libraries/cms/installer/installer.php b/libraries/cms/installer/installer.php
@@ -953,6 +953,15 @@ public function parseSQLFiles($element)
 						 */
 						$query = $db->convertUtf8mb4QueryToUtf8($query);
 
+						/**
+						 * This is a query which was supposed to convert tables to utf8mb4 charset but the server doesn't
+						 * support utf8mb4. Therefore we don't have to run it, it has no effect and it's a mere waste of time.
+						 */
+						if (!$db->hasUTF8mb4Support() && stristr($query, 'CONVERT TO CHARACTER SET utf8 '))
+						{
+							continue;
+						}
+
 						$db->setQuery($query);
 
 						if (!$db->execute())