diff --git a/src/Database/Connection.php b/src/Database/Connection.php index 831078943..2d1aefa8a 100644 --- a/src/Database/Connection.php +++ b/src/Database/Connection.php @@ -71,8 +71,8 @@ public function connect(): void ? 'Nette\Database\Drivers\\' . ucfirst(str_replace('sql', 'Sql', $this->pdo->getAttribute(PDO::ATTR_DRIVER_NAME))) . 'Driver' : $this->options['driverClass']; $this->driver = new $class; - $this->driver->initialize($this, $this->options); $this->preprocessor = new SqlPreprocessor($this); + $this->driver->initialize($this, $this->options); $this->onConnect($this); } diff --git a/src/Database/Drivers/MySqlDriver.php b/src/Database/Drivers/MySqlDriver.php index 009746179..c979d310d 100644 --- a/src/Database/Drivers/MySqlDriver.php +++ b/src/Database/Drivers/MySqlDriver.php @@ -39,10 +39,10 @@ public function initialize(Nette\Database\Connection $connection, array $options $charset = $options['charset'] ?? (version_compare($connection->getPdo()->getAttribute(\PDO::ATTR_SERVER_VERSION), '5.5.3', '>=') ? 'utf8mb4' : 'utf8'); if ($charset) { - $connection->query("SET NAMES '$charset'"); + $connection->query('SET NAMES ?', $charset); } if (isset($options['sqlmode'])) { - $connection->query("SET sql_mode='$options[sqlmode]'"); + $connection->query('SET sql_mode=?', $options['sqlmode']); } }