Use mySQL charset in connection string instead of SET NAMES (#7232)

And switch to utf8mb4 as it is what we're using right now in db schema.
pull/7266/head
Aleksander Machniak 4 years ago
parent 80a244756d
commit b7410ffe89

@ -46,17 +46,6 @@ class rcube_db_mysql extends rcube_db
$this->options['identifier_end'] = '`';
}
/**
* Driver-specific configuration of database connection
*
* @param array $dsn DSN for DB connections
* @param PDO $dbh Connection handler
*/
protected function conn_configure($dsn, $dbh)
{
$dbh->query("SET NAMES 'utf8'");
}
/**
* Abstract SQL statement for value concatenation
*
@ -101,7 +90,7 @@ class rcube_db_mysql extends rcube_db
$params[] = 'unix_socket=' . $dsn['socket'];
}
$params[] = 'charset=utf8';
$params[] = 'charset=' . ($dsn['charset'] ?: 'utf8mb4');
if (!empty($params)) {
$result .= implode(';', $params);

Loading…
Cancel
Save