Add forgotten UPPER()

joomla · Jul 20, 2019 · 32711a0 · 32711a0
1 parent 585c817
commit 32711a0
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/libraries/src/Schema/ChangeItem/MysqlChangeItem.php b/libraries/src/Schema/ChangeItem/MysqlChangeItem.php
@@ -291,30 +291,32 @@ private function fixQuote($string)
 	 */
 	private function fixUtf8mb4TypeChecks($type)
 	{
-		$uType = strtoupper(str_replace(';', '', $type));
+		$fixedType = str_replace(';', '', $type);
 
 		if ($this->db->hasUTF8mb4Support())
 		{
+			$uType = strtoupper($fixedType);
+
 			if ($uType === 'TINYTEXT')
 			{
-				$typeCheck = 'type IN (' . $this->db->quote('TINYTEXT') . ',' . $this->db->quote('TEXT') . ')';
+				$typeCheck = 'UPPER(type) IN (' . $this->db->quote('TINYTEXT') . ',' . $this->db->quote('TEXT') . ')';
 			}
 			elseif ($uType === 'TEXT')
 			{
-				$typeCheck = 'type IN (' . $this->db->quote('TEXT') . ',' . $this->db->quote('MEDIUMTEXT') . ')';
+				$typeCheck = 'UPPER(type) IN (' . $this->db->quote('TEXT') . ',' . $this->db->quote('MEDIUMTEXT') . ')';
 			}
 			elseif ($uType === 'MEDIUMTEXT')
 			{
-				$typeCheck = 'type IN (' . $this->db->quote('MEDIUMTEXT') . ',' . $this->db->quote('LONGTEXT') . ')';
+				$typeCheck = 'UPPER(type) IN (' . $this->db->quote('MEDIUMTEXT') . ',' . $this->db->quote('LONGTEXT') . ')';
 			}
 			else
 			{
-				$typeCheck = 'type = ' . $this->db->quote($uType);
+				$typeCheck = 'UPPER(type) = ' . $this->db->quote($fixedType);
 			}
 		}
 		else
 		{
-			$typeCheck = 'type = ' . $this->db->quote($uType);
+			$typeCheck = 'UPPER(type) = ' . $this->db->quote($fixedType);
 		}
 
 		return $typeCheck;