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

Исправление ошибки в SqlCriteria.count() для запросов в которых есть свой индивидуальный select и groupby

Browse Source
This commit is contained in:
Alexander Demidov
2014-09-27 17:00:46 +04:00
parent b7ff8ab3fc
commit 67f47b882b
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Model/SqlCriteria.php
View File

@ -83,8 +83,10 @@ class SqlCriteria
{
$this->defineJoinExpressions($select);
$sql_expression_backup = $this->sql_expression;
$select = 'COUNT(*) as count';
if (!$this->sql_expression) {
$this->sql_expression = 'SELECT COUNT(' . ($select ? $select : '*') . ') as count FROM :table';
$select = 'x.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;

4
Model/SqlModel.php
View File

@ -226,12 +226,12 @@ abstract class SqlModel extends Model
return new SqlResultProvider($result);
}
public function count($where, $heaving = null, $group_by = null, $sql_expression = null, $sql_expression_params = array(), $cache_key = null)
public function count($select = 'x.count', $where, $heaving = null, $group_by = null, $sql_expression = null, $sql_expression_params = array(), $cache_key = null)
{
$where = $this->db->whereExpr($where);
$group_by = $this->db->groupByExpr($group_by);
$result = $this->query(
'SELECT x.count FROM (' .
'SELECT ' . $select . ' FROM (' .
(($sql_expression) ? $sql_expression : ('SELECT * FROM ' . $this->identify($this->table())))
. (($where) ? (' WHERE ' . $where) : '')
. (($group_by) ? (' GROUP BY ' . $group_by) : '') . ') AS x',