|
@@ -160,8 +160,8 @@ discard block |
|
|
block discarded – undo |
|
160
|
160
|
$offset = count($this->dataColumns); |
|
161
|
161
|
|
|
162
|
162
|
foreach ($columns as $column) { |
|
163
|
|
- $columnAlias = 'c' . (++$this->countColumns); |
|
164
|
|
- $this->dataColumns[] = $table . '.' . $column . ' AS ' . $columnAlias; |
|
|
163
|
+ $columnAlias = 'c'.(++$this->countColumns); |
|
|
164
|
+ $this->dataColumns[] = $table.'.'.$column.' AS '.$columnAlias; |
|
165
|
165
|
} |
|
166
|
166
|
|
|
167
|
167
|
return $offset; |
|
@@ -533,7 +533,7 @@ discard block |
|
|
block discarded – undo |
|
533
|
533
|
public function count($column = self::DEFAULT_COUNTING_FIELD) |
|
534
|
534
|
{ |
|
535
|
535
|
if ($column == self::DEFAULT_COUNTING_FIELD && !empty($this->loader->getPrimaryKey())) { |
|
536
|
|
- $column = 'DISTINCT(' . $this->loader->getPrimaryKey() . ')'; |
|
|
536
|
+ $column = 'DISTINCT('.$this->loader->getPrimaryKey().')'; |
|
537
|
537
|
} |
|
538
|
538
|
|
|
539
|
539
|
return parent::count($column); |
Please login to merge, or discard this patch.