@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | $port = !empty($settings['port']) ? ';port='.$settings['port'] : ''; |
| 90 | 90 | $dbname = !empty($settings['database']) ? ';dbname='.$settings['database'] : ''; |
| 91 | 91 | $options = [ |
| 92 | - // \PDO::ATTR_EMULATE_PREPARES => false, |
|
| 92 | + // \PDO::ATTR_EMULATE_PREPARES => false, |
|
| 93 | 93 | ]; |
| 94 | 94 | |
| 95 | 95 | $this->pdo = new \PDO( |
@@ -153,11 +153,11 @@ discard block |
||
| 153 | 153 | public function addForeignKey($fkName, $srcTable, $srcColumn, $refTable, $refColumn) |
| 154 | 154 | { |
| 155 | 155 | $sql = sprintf('ALTER TABLE %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s)', |
| 156 | - $this->escape($srcTable), |
|
| 157 | - $fkName, |
|
| 158 | - $this->escape($srcColumn), |
|
| 159 | - $this->escape($refTable), |
|
| 160 | - $this->escape($refColumn) |
|
| 156 | + $this->escape($srcTable), |
|
| 157 | + $fkName, |
|
| 158 | + $this->escape($srcColumn), |
|
| 159 | + $this->escape($refTable), |
|
| 160 | + $this->escape($refColumn) |
|
| 161 | 161 | ); |
| 162 | 162 | return $this->prepareAndExecuteSql($sql); |
| 163 | 163 | } |
@@ -174,8 +174,8 @@ discard block |
||
| 174 | 174 | public function dropForeignKey($fkName, $tableName) |
| 175 | 175 | { |
| 176 | 176 | $sql = sprintf('ALTER TABLE %s DROP FOREIGN KEY %s', |
| 177 | - $this->escape($tableName), |
|
| 178 | - $fkName |
|
| 177 | + $this->escape($tableName), |
|
| 178 | + $fkName |
|
| 179 | 179 | ); |
| 180 | 180 | return $this->prepareAndExecuteSql($sql); |
| 181 | 181 | } |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | "'" . $userPassword ."'" |
| 231 | 231 | )); |
| 232 | 232 | return $this->prepareAndExecuteSql($sql); |
| 233 | - } |
|
| 233 | + } |
|
| 234 | 234 | |
| 235 | 235 | /** |
| 236 | 236 | * Drop a user |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | * |
| 261 | 261 | * @return bool True if the user has been granted, otherwise false. |
| 262 | 262 | */ |
| 263 | - public function grantUser($databaseName, $userName) |
|
| 263 | + public function grantUser($databaseName, $userName) |
|
| 264 | 264 | { |
| 265 | 265 | $sql = trim(sprintf('GRANT ALL ON %s.* TO %s@%s; FLUSH PRIVILEGES;', |
| 266 | 266 | $this->escape($databaseName), |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | public function escapeIdentifier($identifier) |
| 61 | 61 | { |
| 62 | - return '`' . $identifier .'`'; |
|
| 62 | + return '`'.$identifier.'`'; |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | /** |
@@ -85,15 +85,15 @@ discard block |
||
| 85 | 85 | */ |
| 86 | 86 | public function createConnection(array $settings) |
| 87 | 87 | { |
| 88 | - $charset = !empty($settings['charset']) ? ';charset='.$settings['charset'] : ';charset=utf8'; |
|
| 89 | - $port = !empty($settings['port']) ? ';port='.$settings['port'] : ''; |
|
| 90 | - $dbname = !empty($settings['database']) ? ';dbname='.$settings['database'] : ''; |
|
| 88 | + $charset = !empty($settings['charset']) ? ';charset='.$settings['charset'] : ';charset=utf8'; |
|
| 89 | + $port = !empty($settings['port']) ? ';port='.$settings['port'] : ''; |
|
| 90 | + $dbname = !empty($settings['database']) ? ';dbname='.$settings['database'] : ''; |
|
| 91 | 91 | $options = [ |
| 92 | 92 | // \PDO::ATTR_EMULATE_PREPARES => false, |
| 93 | 93 | ]; |
| 94 | 94 | |
| 95 | 95 | $this->pdo = new \PDO( |
| 96 | - 'mysql:host='.$settings['hostname'] .$port .$dbname .$charset, |
|
| 96 | + 'mysql:host='.$settings['hostname'].$port.$dbname.$charset, |
|
| 97 | 97 | $settings['username'], |
| 98 | 98 | $settings['password'], |
| 99 | 99 | $options |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | { |
| 193 | 193 | $sql = 'SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = :dbName'; |
| 194 | 194 | $query = $this->pdo->prepare($sql); |
| 195 | - $query->bindValue(':dbName', $databaseName, \PDO::PARAM_STR); |
|
| 195 | + $query->bindValue(':dbName', $databaseName, \PDO::PARAM_STR); |
|
| 196 | 196 | $query->execute(); |
| 197 | 197 | return (bool) $query->fetchColumn(); |
| 198 | 198 | } |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | */ |
| 210 | 210 | public function createDatabase($databaseName, $owner) |
| 211 | 211 | { |
| 212 | - $sql = trim(sprintf('CREATE DATABASE %s', $this->escape($databaseName))); |
|
| 212 | + $sql = trim(sprintf('CREATE DATABASE %s', $this->escape($databaseName))); |
|
| 213 | 213 | return $this->prepareAndExecuteSql($sql); |
| 214 | 214 | } |
| 215 | 215 | |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | $sql = trim(sprintf('CREATE USER %s@%s IDENTIFIED BY %s', |
| 228 | 228 | $this->escape($userName), |
| 229 | 229 | $this->escape($this->getHostName()), |
| 230 | - "'" . $userPassword ."'" |
|
| 230 | + "'".$userPassword."'" |
|
| 231 | 231 | )); |
| 232 | 232 | return $this->prepareAndExecuteSql($sql); |
| 233 | 233 | } |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | public function dropUser($userName, $ifExists = false) |
| 245 | 245 | { |
| 246 | 246 | $sql = trim(sprintf('DROP USER %s %s@%s', |
| 247 | - $ifExists === true ? 'IF EXISTS': '', |
|
| 247 | + $ifExists === true ? 'IF EXISTS' : '', |
|
| 248 | 248 | $this->escape($userName), |
| 249 | 249 | $this->escape($this->getHostName()) |
| 250 | 250 | )); |
@@ -311,7 +311,7 @@ discard block |
||
| 311 | 311 | */ |
| 312 | 312 | public function sqlCreateTableOptions() |
| 313 | 313 | { |
| 314 | - $engine = !empty($settings['engine']) ? $settings['engine'] : 'InnoDB'; |
|
| 314 | + $engine = !empty($settings['engine']) ? $settings['engine'] : 'InnoDB'; |
|
| 315 | 315 | $charset = !empty($settings['charset']) ? $settings['charset'] : 'utf8'; |
| 316 | 316 | $collate = !empty($settings['collate']) ? $settings['collate'] : 'utf8_unicode_ci'; |
| 317 | 317 | return sprintf('ENGINE=%s DEFAULT CHARSET=%s COLLATE=%s;', $engine, $charset, $collate); |
@@ -340,7 +340,7 @@ discard block |
||
| 340 | 340 | */ |
| 341 | 341 | public function sqlColumnAutoIncrement($type) |
| 342 | 342 | { |
| 343 | - return $type .' AUTO_INCREMENT'; |
|
| 343 | + return $type.' AUTO_INCREMENT'; |
|
| 344 | 344 | } |
| 345 | 345 | |
| 346 | 346 | } |