diff --git a/Model/SqlCriteria.php b/Model/SqlCriteria.php index a77d153..c437d06 100644 --- a/Model/SqlCriteria.php +++ b/Model/SqlCriteria.php @@ -79,16 +79,17 @@ class SqlCriteria return $this->model->find('', '', $this->where, null, null, null, null, 'DELETE FROM :table', $this->sql_expression_params)->affectedRows(); } + //TODO: перенести определение sql_expression в модель public function count($select = null) { $this->defineJoinExpressions($select); $sql_expression_backup = $this->sql_expression; - $select = 'COUNT(*) as count'; + $select_parent_query = 'COUNT(*) as count'; if (!$this->sql_expression) { $this->sql_expression = 'SELECT COUNT(' . ($select ? $select : '*') . ') as count FROM :table'; - $select = 'x.count'; + $select_parent_query = 'x.count'; } - $count = $this->model->count($select, $this->where, null, $this->group_by, $this->sql_expression, $this->sql_expression_params)->fetchField('count'); + $count = $this->model->count($select_parent_query, $this->where, null, $this->group_by, $this->sql_expression, $this->sql_expression_params)->fetchField('count'); $this->sql_expression = $sql_expression_backup; return $count; } diff --git a/Model/SqlModel.php b/Model/SqlModel.php index e5cf525..669f6e7 100644 --- a/Model/SqlModel.php +++ b/Model/SqlModel.php @@ -226,12 +226,12 @@ abstract class SqlModel extends Model return new SqlResultProvider($result); } - public function count($select = 'x.count', $where, $heaving = null, $group_by = null, $sql_expression = null, $sql_expression_params = array(), $cache_key = null) + public function count($select_parent_query = '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 ' . $select . ' FROM (' . + 'SELECT ' . $select_parent_query . ' FROM (' . (($sql_expression) ? $sql_expression : ('SELECT * FROM ' . $this->identify($this->table()))) . (($where) ? (' WHERE ' . $where) : '') . (($group_by) ? (' GROUP BY ' . $group_by) : '') . ') AS x',