Adding version check to getCharsetName() for MySQL Datasource.

This commit is contained in:
predominant 2009-11-16 13:49:52 +11:00
parent aa97daeea9
commit a91108a81a

View file

@ -456,13 +456,14 @@ class DboMysqlBase extends DboSource {
* @return string Character set name * @return string Character set name
*/ */
function getCharsetName($name) { function getCharsetName($name) {
if ((bool)version_compare(mysql_get_server_info($this->connection), "5", ">=")) {
$cols = $this->query('SELECT CHARACTER_SET_NAME FROM INFORMATION_SCHEMA.COLLATIONS WHERE COLLATION_NAME= ' . $this->value($name) . ';'); $cols = $this->query('SELECT CHARACTER_SET_NAME FROM INFORMATION_SCHEMA.COLLATIONS WHERE COLLATION_NAME= ' . $this->value($name) . ';');
if (isset($cols[0]['COLLATIONS']['CHARACTER_SET_NAME'])) { if (isset($cols[0]['COLLATIONS']['CHARACTER_SET_NAME'])) {
return $cols[0]['COLLATIONS']['CHARACTER_SET_NAME']; return $cols[0]['COLLATIONS']['CHARACTER_SET_NAME'];
} }
}
return false; return false;
} }
} }
/** /**