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

Merge branch 'sql_criteria' of dimti.ru:majestic into sql_criteria

Browse Source
This commit is contained in:
Alexander Demidov
2014-04-25 20:17:15 +04:00
parent 3a560dfe6f d1c8ecf850
commit 0b0dc61960
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
model/SqlCriteria.php
View File

@ -80,7 +80,11 @@ class SqlCriteria
public function count() public function count()
{ {
if ($this->sql_expression && strpos($this->sql_expression, 'COUNT(*) as count')) {
;
} else {
$this->sql_expression = 'SELECT COUNT(*) as count FROM :table'; $this->sql_expression = 'SELECT COUNT(*) as count FROM :table';
}
$this->defineJoinExpressions(); $this->defineJoinExpressions();
return $this->model->find(array(), '', $this->where, null, null, null, null, $this->sql_expression, $this->sql_expression_params)->fetchField('count'); return $this->model->find(array(), '', $this->where, null, null, null, null, $this->sql_expression, $this->sql_expression_params)->fetchField('count');
} }