@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * @param array $options |
42 | 42 | */ |
43 | 43 | public function __construct(PDO $pdo, array $options = []) { |
44 | - if($pdo->getAttribute(PDO::ATTR_ERRMODE) === PDO::ERRMODE_SILENT) { |
|
44 | + if ($pdo->getAttribute(PDO::ATTR_ERRMODE) === PDO::ERRMODE_SILENT) { |
|
45 | 45 | $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
46 | 46 | } |
47 | 47 | $this->pdo = $pdo; |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | * @return VirtualTables |
76 | 76 | */ |
77 | 77 | public function getVirtualTables() { |
78 | - if($this->virtualTables === null) { |
|
78 | + if ($this->virtualTables === null) { |
|
79 | 79 | $this->virtualTables = new VirtualTables(); |
80 | 80 | } |
81 | 81 | return $this->virtualTables; |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | * @return QueryStatement |
88 | 88 | */ |
89 | 89 | public function query($query) { |
90 | - return $this->buildQueryStatement($query, function ($query) { |
|
90 | + return $this->buildQueryStatement($query, function($query) { |
|
91 | 91 | $stmt = $this->pdo->query($query); |
92 | 92 | return $stmt; |
93 | 93 | }); |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | * @return QueryStatement |
100 | 100 | */ |
101 | 101 | public function prepare($query) { |
102 | - return $this->buildQueryStatement((string) $query, function ($query) { |
|
102 | + return $this->buildQueryStatement((string) $query, function($query) { |
|
103 | 103 | $stmt = $this->pdo->prepare($query); |
104 | 104 | return $stmt; |
105 | 105 | }); |
@@ -111,11 +111,11 @@ discard block |
||
111 | 111 | * @return int |
112 | 112 | */ |
113 | 113 | public function exec($query, array $params = []) { |
114 | - return $this->exceptionHandler(function () use ($query, $params) { |
|
114 | + return $this->exceptionHandler(function() use ($query, $params) { |
|
115 | 115 | $stmt = $this->pdo->prepare($query); |
116 | 116 | $timer = microtime(true); |
117 | 117 | $stmt->execute($params); |
118 | - $this->queryLoggers->log($query, microtime(true) - $timer); |
|
118 | + $this->queryLoggers->log($query, microtime(true)-$timer); |
|
119 | 119 | $result = $stmt->rowCount(); |
120 | 120 | $stmt->closeCursor(); |
121 | 121 | return $result; |
@@ -135,12 +135,12 @@ discard block |
||
135 | 135 | */ |
136 | 136 | public function getTableFields($table) { |
137 | 137 | $table = $this->select()->aliasReplacer()->replace($table); |
138 | - if(array_key_exists($table, self::$tableFields)) { |
|
138 | + if (array_key_exists($table, self::$tableFields)) { |
|
139 | 139 | return self::$tableFields[$table]; |
140 | 140 | } |
141 | 141 | $stmt = $this->pdo->query("DESCRIBE {$table}"); |
142 | 142 | $rows = $stmt->fetchAll(\PDO::FETCH_ASSOC); |
143 | - self::$tableFields[$table] = array_map(function ($row) { return $row['Field']; }, $rows); |
|
143 | + self::$tableFields[$table] = array_map(function($row) { return $row['Field']; }, $rows); |
|
144 | 144 | $stmt->closeCursor(); |
145 | 145 | return self::$tableFields[$table]; |
146 | 146 | } |
@@ -152,12 +152,12 @@ discard block |
||
152 | 152 | */ |
153 | 153 | public function quoteExpression($expression, array $arguments = array()) { |
154 | 154 | $index = -1; |
155 | - $func = function () use ($arguments, &$index) { |
|
155 | + $func = function() use ($arguments, &$index) { |
|
156 | 156 | $index++; |
157 | - if(array_key_exists($index, $arguments)) { |
|
157 | + if (array_key_exists($index, $arguments)) { |
|
158 | 158 | $argument = $arguments[$index]; |
159 | 159 | $value = $this->quote($argument); |
160 | - } elseif(count($arguments) > 0) { |
|
160 | + } elseif (count($arguments) > 0) { |
|
161 | 161 | $args = $arguments; |
162 | 162 | $value = array_pop($args); |
163 | 163 | $value = $this->quote($value); |
@@ -175,14 +175,14 @@ discard block |
||
175 | 175 | * @return string |
176 | 176 | */ |
177 | 177 | public function quote($value) { |
178 | - if(is_null($value)) { |
|
178 | + if (is_null($value)) { |
|
179 | 179 | $result = 'NULL'; |
180 | - } elseif($value instanceof Builder\DBExpr) { |
|
180 | + } elseif ($value instanceof Builder\DBExpr) { |
|
181 | 181 | $result = $value->getExpression(); |
182 | - } elseif($value instanceof Builder\Select) { |
|
182 | + } elseif ($value instanceof Builder\Select) { |
|
183 | 183 | $result = sprintf('(%s)', (string) $value); |
184 | - } elseif(is_array($value)) { |
|
185 | - $result = join(', ', array_map(function ($value) { return $this->quote($value); }, $value)); |
|
184 | + } elseif (is_array($value)) { |
|
185 | + $result = join(', ', array_map(function($value) { return $this->quote($value); }, $value)); |
|
186 | 186 | } else { |
187 | 187 | $result = $this->pdo->quote($value); |
188 | 188 | } |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | if (is_numeric($field) || !is_string($field)) { |
198 | 198 | throw new UnexpectedValueException('Field name is invalid'); |
199 | 199 | } |
200 | - if(strpos($field, '`') !== false) { |
|
200 | + if (strpos($field, '`') !== false) { |
|
201 | 201 | return (string) $field; |
202 | 202 | } |
203 | 203 | $parts = explode('.', $field); |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | $select = array_key_exists('select-factory', $this->options) |
213 | 213 | ? call_user_func($this->options['select-factory'], $this, $this->options['select-options']) |
214 | 214 | : new Builder\RunnableSelect($this, $this->options['select-options']); |
215 | - if($fields !== null) { |
|
215 | + if ($fields !== null) { |
|
216 | 216 | $select->fields($fields); |
217 | 217 | } |
218 | 218 | return $select; |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | $insert = array_key_exists('insert-factory', $this->options) |
227 | 227 | ? call_user_func($this->options['insert-factory'], $this, $this->options['insert-options']) |
228 | 228 | : new Builder\RunnableInsert($this, $this->options['insert-options']); |
229 | - if($fields !== null) { |
|
229 | + if ($fields !== null) { |
|
230 | 230 | $insert->addAll($fields); |
231 | 231 | } |
232 | 232 | return $insert; |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | $update = array_key_exists('update-factory', $this->options) |
241 | 241 | ? call_user_func($this->options['update-factory'], $this, $this->options['update-options']) |
242 | 242 | : new Builder\RunnableUpdate($this, $this->options['update-options']); |
243 | - if($fields !== null) { |
|
243 | + if ($fields !== null) { |
|
244 | 244 | $update->setAll($fields); |
245 | 245 | } |
246 | 246 | return $update; |
@@ -259,8 +259,8 @@ discard block |
||
259 | 259 | * @return $this |
260 | 260 | */ |
261 | 261 | public function transactionStart() { |
262 | - if((int) $this->transactionLevel === 0) { |
|
263 | - if($this->pdo->inTransaction()) { |
|
262 | + if ((int) $this->transactionLevel === 0) { |
|
263 | + if ($this->pdo->inTransaction()) { |
|
264 | 264 | $this->outerTransaction = true; |
265 | 265 | } else { |
266 | 266 | $this->pdo->beginTransaction(); |
@@ -274,7 +274,7 @@ discard block |
||
274 | 274 | * @return $this |
275 | 275 | */ |
276 | 276 | public function transactionCommit() { |
277 | - return $this->transactionEnd(function () { |
|
277 | + return $this->transactionEnd(function() { |
|
278 | 278 | $this->pdo->commit(); |
279 | 279 | }); |
280 | 280 | } |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | * @return $this |
284 | 284 | */ |
285 | 285 | public function transactionRollback() { |
286 | - return $this->transactionEnd(function () { |
|
286 | + return $this->transactionEnd(function() { |
|
287 | 287 | $this->pdo->rollBack(); |
288 | 288 | }); |
289 | 289 | } |
@@ -293,7 +293,7 @@ discard block |
||
293 | 293 | * @return mixed |
294 | 294 | */ |
295 | 295 | public function dryRun($callback = null) { |
296 | - if(!$this->pdo->inTransaction()) { |
|
296 | + if (!$this->pdo->inTransaction()) { |
|
297 | 297 | $this->transactionStart(); |
298 | 298 | try { |
299 | 299 | return call_user_func($callback, $this); |
@@ -317,26 +317,26 @@ discard block |
||
317 | 317 | */ |
318 | 318 | public function transaction(callable $callback = null) { |
319 | 319 | $result = null; |
320 | - if(!$this->pdo->inTransaction()) { |
|
320 | + if (!$this->pdo->inTransaction()) { |
|
321 | 321 | $this->transactionStart(); |
322 | 322 | try { |
323 | 323 | $result = call_user_func($callback, $this); |
324 | 324 | $this->transactionCommit(); |
325 | 325 | return $result; |
326 | 326 | } finally { |
327 | - if($this->pdo->inTransaction()) { |
|
327 | + if ($this->pdo->inTransaction()) { |
|
328 | 328 | $this->transactionRollback(); |
329 | 329 | } |
330 | 330 | } |
331 | 331 | } else { |
332 | 332 | $uniqueId = $this->genUniqueId(); |
333 | 333 | $this->exec("SAVEPOINT {$uniqueId}"); |
334 | - $finally = function () use ($uniqueId) { |
|
334 | + $finally = function() use ($uniqueId) { |
|
335 | 335 | $this->exec("ROLLBACK TO {$uniqueId}"); |
336 | 336 | }; |
337 | 337 | try { |
338 | 338 | $result = call_user_func($callback, $this); |
339 | - $finally = function () use ($uniqueId) { |
|
339 | + $finally = function() use ($uniqueId) { |
|
340 | 340 | $this->exec("RELEASE SAVEPOINT {$uniqueId}"); |
341 | 341 | }; |
342 | 342 | return $result; |
@@ -353,11 +353,11 @@ discard block |
||
353 | 353 | */ |
354 | 354 | private function transactionEnd($fn) { |
355 | 355 | $this->transactionLevel--; |
356 | - if($this->transactionLevel < 0) { |
|
356 | + if ($this->transactionLevel < 0) { |
|
357 | 357 | throw new RuntimeException("Transaction-Nesting-Problem: Trying to invoke commit on a already closed transaction"); |
358 | 358 | } |
359 | - if((int) $this->transactionLevel === 0) { |
|
360 | - if($this->outerTransaction) { |
|
359 | + if ((int) $this->transactionLevel === 0) { |
|
360 | + if ($this->outerTransaction) { |
|
361 | 361 | $this->outerTransaction = false; |
362 | 362 | } else { |
363 | 363 | call_user_func($fn); |
@@ -374,7 +374,7 @@ discard block |
||
374 | 374 | */ |
375 | 375 | private function buildQueryStatement($query, $fn) { |
376 | 376 | $stmt = call_user_func($fn, $query); |
377 | - if(!$stmt) { |
|
377 | + if (!$stmt) { |
|
378 | 378 | throw new RuntimeException("Could not execute statement:\n{$query}"); |
379 | 379 | } |
380 | 380 | $stmtWrapper = new QueryStatement($stmt, $query, $this->exceptionInterpreter, $this->queryLoggers); |