Improve collation detection in MySQL drivers

joomla-framework · Apr 3, 2016 · 38e3e73 · 38e3e73
1 parent 5e1e27d
commit 38e3e73
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 28 deletions.
diff --git a/src/Mysql/MysqlDriver.php b/src/Mysql/MysqlDriver.php
@@ -162,20 +162,7 @@ public function getCollation()
 	{
 		$this->connect();
 
-		$tables = $this->getTableList();
-
-		$this->setQuery('SHOW FULL COLUMNS FROM ' . $tables[0]);
-		$array = $this->loadAssocList();
-
-		foreach ($array as $field)
-		{
-			if (!is_null($field['Collation']))
-			{
-				return $field['Collation'];
-			}
-		}
-
-		return null;
+		return $this->setQuery('SELECT @@collation_database;')->loadResult();
 	}
 
 	/**

diff --git a/src/Mysqli/MysqliDriver.php b/src/Mysqli/MysqliDriver.php
@@ -311,20 +311,7 @@ public function getCollation()
 	{
 		$this->connect();
 
-		$tables = $this->getTableList();
-
-		$this->setQuery('SHOW FULL COLUMNS FROM ' . $tables[0]);
-		$array = $this->loadAssocList();
-
-		foreach ($array as $field)
-		{
-			if (!is_null($field['Collation']))
-			{
-				return $field['Collation'];
-			}
-		}
-
-		return null;
+		return $this->setQuery('SELECT @@collation_database;')->loadResult();
 	}
 
 	/**