@@ -152,8 +152,8 @@ discard block |
||
| 152 | 152 | { |
| 153 | 153 | $offset = count($this->dataColumns); |
| 154 | 154 | foreach ($columns as $column) { |
| 155 | - $columnAlias = 'c' . (++$this->countColumns); |
|
| 156 | - $this->dataColumns[] = $table . '.' . $column . ' AS ' . $columnAlias; |
|
| 155 | + $columnAlias = 'c'.(++$this->countColumns); |
|
| 156 | + $this->dataColumns[] = $table.'.'.$column.' AS '.$columnAlias; |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | return $offset; |
@@ -529,7 +529,7 @@ discard block |
||
| 529 | 529 | public function count($column = self::DEFAULT_COUNTING_FIELD) |
| 530 | 530 | { |
| 531 | 531 | if ($column == self::DEFAULT_COUNTING_FIELD && !empty($this->loader->getPrimaryKey())) { |
| 532 | - $column = 'DISTINCT(' . $this->loader->getPrimaryKey().')'; |
|
| 532 | + $column = 'DISTINCT('.$this->loader->getPrimaryKey().')'; |
|
| 533 | 533 | } |
| 534 | 534 | |
| 535 | 535 | return parent::count($column); |