@@ -119,7 +119,7 @@ |
||
119 | 119 | |
120 | 120 | // @todo: whitelist types? |
121 | 121 | $nolengthtypes = ['DATE', 'TINYBLOB', 'TINYTEXT', 'BLOB', 'TEXT', 'MEDIUMBLOB', |
122 | - 'MEDIUMTEXT', 'LONGBLOB', 'LONGTEXT', 'SERIAL', 'BOOLEAN', 'UUID']; |
|
122 | + 'MEDIUMTEXT', 'LONGBLOB', 'LONGTEXT', 'SERIAL', 'BOOLEAN', 'UUID']; |
|
123 | 123 | |
124 | 124 | $field[] = (is_int($length) || (is_string($length) && count(explode(',', $length)) === 2)) && !in_array($type, $nolengthtypes, true) |
125 | 125 | ? $type.'('. $length . ')' |
@@ -77,13 +77,13 @@ discard block |
||
77 | 77 | $sql[] = 'TEMPORARY'; |
78 | 78 | } |
79 | 79 | |
80 | - $sql[] = 'TABLE' ; |
|
80 | + $sql[] = 'TABLE'; |
|
81 | 81 | |
82 | 82 | if($ifNotExists){ |
83 | - $sql[] = 'IF NOT EXISTS' ; |
|
83 | + $sql[] = 'IF NOT EXISTS'; |
|
84 | 84 | } |
85 | 85 | |
86 | - $sql[] = $this->quote($table); |
|
86 | + $sql[] = $this->quote($table); |
|
87 | 87 | |
88 | 88 | if(!empty($cols)){ |
89 | 89 | $sql[] = '('; |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | if(!empty($primaryKey)){ |
93 | 93 | $sql[] = ', PRIMARY KEY ('; |
94 | 94 | $sql[] = $this->quote($primaryKey); |
95 | - $sql[] = ')'; |
|
95 | + $sql[] = ')'; |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | $sql[] = ')'; |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | 'MEDIUMTEXT', 'LONGBLOB', 'LONGTEXT', 'SERIAL', 'BOOLEAN', 'UUID']; |
128 | 128 | |
129 | 129 | $field[] = (is_int($length) || (is_string($length) && count(explode(',', $length)) === 2)) && !in_array($type, $nolengthtypes, true) |
130 | - ? $type.'('. $length . ')' |
|
130 | + ? $type.'('.$length.')' |
|
131 | 131 | : $type; |
132 | 132 | |
133 | 133 | if($attribute){ |
@@ -56,7 +56,7 @@ |
||
56 | 56 | |
57 | 57 | /** @inheritdoc */ |
58 | 58 | public function createDatabase(string $dbname, bool $ifNotExists = null, string $collate = null):array{ |
59 | - $sql = [ 'CREATE DATABASE']; |
|
59 | + $sql = ['CREATE DATABASE']; |
|
60 | 60 | $sql[] = $this->quote($dbname); |
61 | 61 | |
62 | 62 | if($collate){ |
@@ -187,7 +187,7 @@ |
||
187 | 187 | |
188 | 188 | /** @inheritdoc */ |
189 | 189 | public function truncate(string $table):array{ |
190 | - $sql = ['DELETE FROM'];// RECREATE TABLE [table spec] ...stupid firebird 2.5 |
|
190 | + $sql = ['DELETE FROM']; // RECREATE TABLE [table spec] ...stupid firebird 2.5 |
|
191 | 191 | $sql[] = $this->quote($table); |
192 | 192 | |
193 | 193 | return $sql; |
@@ -108,7 +108,7 @@ |
||
108 | 108 | |
109 | 109 | /** @inheritdoc */ |
110 | 110 | public function truncate(string $table):array{ |
111 | - $sql = ['DELETE FROM'];// ??? sqlite |
|
111 | + $sql = ['DELETE FROM']; // ??? sqlite |
|
112 | 112 | $sql[] = $this->quote($table); |
113 | 113 | |
114 | 114 | return $sql; |
@@ -69,7 +69,7 @@ |
||
69 | 69 | throw new QueryException('postgres insert on conflict: no conflict target given'); |
70 | 70 | } |
71 | 71 | |
72 | - $sql[] = 'ON CONFLICT ('.$this->quote($conflictTarget).') DO'; |
|
72 | + $sql[] = 'ON CONFLICT ('.$this->quote($conflictTarget).') DO'; |
|
73 | 73 | |
74 | 74 | switch($onConflict){ |
75 | 75 | case 'IGNORE': |
@@ -65,7 +65,7 @@ |
||
65 | 65 | throw new DatabaseException('invalid driver interface'); |
66 | 66 | } |
67 | 67 | |
68 | - $this->query = new QueryBuilder($this->driver, $this->logger); |
|
68 | + $this->query = new QueryBuilder($this->driver, $this->logger); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | /** |
@@ -30,7 +30,7 @@ |
||
30 | 30 | |
31 | 31 | /** @inheritdoc */ |
32 | 32 | public function callback(iterable $values, callable $callback):bool{ |
33 | - $sql = $this->sql(true); |
|
33 | + $sql = $this->sql(true); |
|
34 | 34 | |
35 | 35 | $this->logger->debug('MultiQueryTrait::callback()', ['method' => __METHOD__, 'sql' => $sql, 'val' => $values]); |
36 | 36 |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | |
193 | 193 | // @todo: fixme, cleanup |
194 | 194 | // errors on [alias => col, alias, alias => col...] |
195 | - $_col = function ($expr1, $expr2 = null, $func = null):string { |
|
195 | + $_col = function($expr1, $expr2 = null, $func = null):string { |
|
196 | 196 | switch(true){ |
197 | 197 | case $expr2 && $func: |
198 | 198 | $col = sprintf('%s(%s) AS %s', strtoupper($func), $expr1, $this->quote($expr2)); |
@@ -234,12 +234,12 @@ discard block |
||
234 | 234 | /** @inheritdoc */ |
235 | 235 | public function from(array $expressions):array { |
236 | 236 | |
237 | - $_from = function (string $table, string $ref = null):string { |
|
237 | + $_from = function(string $table, string $ref = null):string { |
|
238 | 238 | // @todo: quotes |
239 | 239 | $from = $this->quote($table); |
240 | 240 | |
241 | 241 | if($ref){ |
242 | - $from = sprintf('%s AS %s', $this->quote($ref), $this->quote($table));// @todo: index hint |
|
242 | + $from = sprintf('%s AS %s', $this->quote($ref), $this->quote($table)); // @todo: index hint |
|
243 | 243 | } |
244 | 244 | |
245 | 245 | return $from; |
@@ -343,9 +343,9 @@ |
||
343 | 343 | public function seek($pos):void{ |
344 | 344 | $this->rewind(); |
345 | 345 | |
346 | - for( ; $this->offset < $pos; ){ |
|
346 | + for(; $this->offset < $pos;){ |
|
347 | 347 | |
348 | - if(!\next($this->array)) { |
|
348 | + if(!\next($this->array)){ |
|
349 | 349 | throw new \OutOfBoundsException('invalid seek position: '.$pos); |
350 | 350 | } |
351 | 351 |
@@ -345,7 +345,7 @@ |
||
345 | 345 | |
346 | 346 | for( ; $this->offset < $pos; ){ |
347 | 347 | |
348 | - if(!\next($this->array)) { |
|
348 | + if(!\next($this->array)){ |
|
349 | 349 | throw new \OutOfBoundsException('invalid seek position: '.$pos); |
350 | 350 | } |
351 | 351 |