From 388673d85631f6addc0d19e243972021872eba67 Mon Sep 17 00:00:00 2001 From: Alexander Demidov Date: Fri, 30 Jan 2015 23:30:22 +0300 Subject: [PATCH] Correct count in SqlCriteria --- Model/SqlCriteria.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Model/SqlCriteria.php b/Model/SqlCriteria.php index 4c6a7a4..71905e5 100644 --- a/Model/SqlCriteria.php +++ b/Model/SqlCriteria.php @@ -88,6 +88,8 @@ class SqlCriteria if (!$this->sql_expression) { $this->sql_expression = 'SELECT COUNT(' . ($select ? $select : '*') . ') as count FROM :table'; $select_parent_query = 'x.count'; + } else { + $this->sql_expression = preg_replace('#SELECT.+FROM#', 'SELECT COUNT(' . ($select ? $select : '*') . ') as count FROM', $this->sql_expression); } $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;