@@ -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 | |