wpstudio/majestic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Исправление ошибки в SqlCriteria.count()

Browse Source
This commit is contained in:
Alexander Demidov
2014-09-26 18:44:35 +04:00
parent b4c3d89020
commit b7ff8ab3fc
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Model/SqlCriteria.php
View File

@ -79,17 +79,14 @@ class SqlCriteria
return $this->model->find('', '', $this->where, null, null, null, null, 'DELETE FROM :table', $this->sql_expression_params)->affectedRows();
}
public function count($select = 'x')
public function count($select = null)
{
$this->defineJoinExpressions($select);
$sql_expression_backup = $this->sql_expression;
if ($select) {
$this->select( $select );
}
if (!$this->sql_expression) {
$this->sql_expression = 'SELECT COUNT(' . ($select ? $select : '*') . ') as count FROM :table';
}
$count = $this->model->count($select, '', $this->where, null, $this->group_by, $this->sql_expression, $this->sql_expression_params)->fetchField('count');
$count = $this->model->count($this->where, null, $this->group_by, $this->sql_expression, $this->sql_expression_params)->fetchField('count');
$this->sql_expression = $sql_expression_backup;
return $count;
}