mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge pull request #8147 from kinglozzer/mysql-pdo-attr
FIX: Only set MYSQL_ATTR_INIT_COMMAND when using mysql driver (fixes #8103)
This commit is contained in:
commit
e1450b5e82
@ -176,9 +176,11 @@ class PDOConnector extends DBConnector
|
|||||||
if (!isset($charset)) {
|
if (!isset($charset)) {
|
||||||
$charset = $connCharset;
|
$charset = $connCharset;
|
||||||
}
|
}
|
||||||
$options = array(
|
|
||||||
PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES ' . $charset . ' COLLATE ' . $connCollation
|
$options = [];
|
||||||
);
|
if ($parameters['driver'] === 'mysql') {
|
||||||
|
$options[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES ' . $charset . ' COLLATE ' . $connCollation;
|
||||||
|
}
|
||||||
|
|
||||||
// Set SSL options if they are defined
|
// Set SSL options if they are defined
|
||||||
if (array_key_exists('ssl_key', $parameters) &&
|
if (array_key_exists('ssl_key', $parameters) &&
|
||||||
|
Loading…
Reference in New Issue
Block a user