@@ -36,8 +36,8 @@ |
||
| 36 | 36 | |
| 37 | 37 | $sql = 'SELECT '; |
| 38 | 38 | $sql .= $this->distinct ? 'DISTINCT ' : ''; |
| 39 | - $sql .= !empty($this->cols) ? implode($glue , $this->cols).PHP_EOL : '* '; |
|
| 40 | - $sql .= 'FROM '.implode($glue , $this->from); |
|
| 39 | + $sql .= !empty($this->cols) ? implode($glue, $this->cols).PHP_EOL : '* '; |
|
| 40 | + $sql .= 'FROM '.implode($glue, $this->from); |
|
| 41 | 41 | $sql .= $this->_getWhere(); |
| 42 | 42 | $sql .= !empty($this->groupby) ? PHP_EOL.'GROUP BY '.implode($glue, $this->groupby) : ''; |
| 43 | 43 | $sql .= !empty($this->orderby) ? PHP_EOL.'ORDER BY '.implode($glue, $this->orderby) : ''; |
@@ -36,8 +36,8 @@ |
||
| 36 | 36 | |
| 37 | 37 | $sql = 'SELECT '; |
| 38 | 38 | $sql .= $this->distinct ? 'DISTINCT ' : ''; |
| 39 | - $sql .= !empty($this->cols) ? implode($glue , $this->cols).PHP_EOL : '* '; |
|
| 40 | - $sql .= 'FROM '.implode($glue , $this->from); |
|
| 39 | + $sql .= !empty($this->cols) ? implode($glue, $this->cols).PHP_EOL : '* '; |
|
| 40 | + $sql .= 'FROM '.implode($glue, $this->from); |
|
| 41 | 41 | $sql .= $this->_getWhere(); |
| 42 | 42 | $sql .= !empty($this->groupby) ? PHP_EOL.'GROUP BY '.implode($glue, $this->groupby) : ''; |
| 43 | 43 | $sql .= !empty($this->orderby) ? PHP_EOL.'ORDER BY '.implode($glue, $this->orderby) : ''; |
@@ -113,9 +113,9 @@ discard block |
||
| 113 | 113 | $insert |
| 114 | 114 | ->into(self::TEST_TABLENAME) |
| 115 | 115 | ->values([ |
| 116 | - ['id' => 1, 'hash' => md5(1), 'data' => 'foo', 'value' => 123.456, 'active' => 0], |
|
| 116 | + ['id' => 1, 'hash' => md5(1), 'data' => 'foo', 'value' => 123.456, 'active' => 0], |
|
| 117 | 117 | ['id' => 2, 'hash' => md5(2), 'data' => 'foo', 'value' => 123.456789, 'active' => 1], |
| 118 | - ['id' => 3, 'hash' => md5(3), 'data' => 'foo', 'value' => 123.456, 'active' => 0], |
|
| 118 | + ['id' => 3, 'hash' => md5(3), 'data' => 'foo', 'value' => 123.456, 'active' => 0], |
|
| 119 | 119 | ]) |
| 120 | 120 | ; |
| 121 | 121 | |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | $select = $this->statement->select; |
| 172 | 172 | $select |
| 173 | 173 | ->from([self::TEST_TABLENAME]) |
| 174 | - ->where('id', [1,2,3], 'in') |
|
| 174 | + ->where('id', [1, 2, 3], 'in') |
|
| 175 | 175 | ->orderBy(['hash' => ['desc', 'lower']]); |
| 176 | 176 | # print_r(PHP_EOL.$select->sql().PHP_EOL); |
| 177 | 177 | $result = $select->execute(); |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | # print_r(PHP_EOL.$update->sql().PHP_EOL); |
| 214 | 214 | $this->assertTrue($update->execute()); |
| 215 | 215 | |
| 216 | - $r = $this->statement->select->from([self::TEST_TABLENAME])->where('id' ,1)->execute(); |
|
| 216 | + $r = $this->statement->select->from([self::TEST_TABLENAME])->where('id', 1)->execute(); |
|
| 217 | 217 | |
| 218 | 218 | $this->assertSame('bar', $r[0]->data); |
| 219 | 219 | $this->assertSame(42.42, (float)$r[0]->value); |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | $this->assertTrue($delete->execute()); |
| 248 | 248 | |
| 249 | 249 | $r = $this->statement->select->from([self::TEST_TABLENAME])->execute(); |
| 250 | - $this->assertCount(3, $r); |
|
| 250 | + $this->assertCount(3, $r); |
|
| 251 | 251 | } |
| 252 | 252 | |
| 253 | 253 | /** |
@@ -43,8 +43,8 @@ |
||
| 43 | 43 | $sql = 'SELECT '; |
| 44 | 44 | $sql .= !is_null($this->limit) ? 'FIRST ? SKIP ? ' : ''; |
| 45 | 45 | $sql .= $this->distinct ? 'DISTINCT ' : ''; |
| 46 | - $sql .= !empty($this->cols) ? implode($glue , $this->cols).PHP_EOL : '* '; |
|
| 47 | - $sql .= 'FROM '.implode($glue , $this->from); |
|
| 46 | + $sql .= !empty($this->cols) ? implode($glue, $this->cols).PHP_EOL : '* '; |
|
| 47 | + $sql .= 'FROM '.implode($glue, $this->from); |
|
| 48 | 48 | $sql .= $this->_getWhere(); |
| 49 | 49 | $sql .= !empty($this->groupby) ? PHP_EOL.'GROUP BY '.implode($glue, $this->groupby) : ''; |
| 50 | 50 | $sql .= !empty($this->orderby) ? PHP_EOL.'ORDER BY '.implode($glue, $this->orderby) : ''; |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | if(is_string($k)){ |
| 119 | 119 | is_array($ref) |
| 120 | 120 | ? $this->addColumn($ref[0], $k, $ref[1] ?? null) |
| 121 | - : $this->addColumn($ref ,$k); |
|
| 121 | + : $this->addColumn($ref, $k); |
|
| 122 | 122 | } |
| 123 | 123 | else{ |
| 124 | 124 | is_array($ref) |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | $from = $this->quote($table); |
| 141 | 141 | |
| 142 | 142 | if($ref){ |
| 143 | - $from = sprintf('%s AS %s', $this->quote($ref), $this->quote($table));// @todo: index hint |
|
| 143 | + $from = sprintf('%s AS %s', $this->quote($ref), $this->quote($table)); // @todo: index hint |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | $this->from[$ref ?? $table] = $from; |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | $dir = strtoupper($expression[0]); |
| 212 | 212 | |
| 213 | 213 | if(in_array($dir, ['ASC', 'DESC'])){ |
| 214 | - $this->orderby[] = isset($expression[1]) ? strtoupper($expression[1]).'('.$this->quote($alias).') '.$dir : $dir; |
|
| 214 | + $this->orderby[] = isset($expression[1]) ? strtoupper($expression[1]).'('.$this->quote($alias).') '.$dir : $dir; |
|
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | } |
@@ -219,7 +219,7 @@ discard block |
||
| 219 | 219 | $dir = strtoupper($expression); |
| 220 | 220 | |
| 221 | 221 | if(in_array($dir, ['ASC', 'DESC'])){ |
| 222 | - $this->orderby[] = $this->quote($alias).' '.$dir; |
|
| 222 | + $this->orderby[] = $this->quote($alias).' '.$dir; |
|
| 223 | 223 | } |
| 224 | 224 | |
| 225 | 225 | } |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | $sql = 'SELECT '; |
| 266 | 266 | $sql .= $this->distinct ? 'DISTINCT ' : ''; |
| 267 | 267 | $sql .= 'COUNT(*) AS '.$this->quote('count'); |
| 268 | - $sql .= 'FROM '.implode($glue , $this->from); |
|
| 268 | + $sql .= 'FROM '.implode($glue, $this->from); |
|
| 269 | 269 | $sql .= $this->_getWhere(); |
| 270 | 270 | $sql .= !empty($this->groupby) ? PHP_EOL.'GROUP BY '.implode($glue, $this->groupby) : ''; |
| 271 | 271 | |