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

Merge remote-tracking branch 'origin/sql_criteria' into namespace

Browse Source
This commit is contained in:
Alexander Demidov
2014-06-03 22:15:44 +04:00
parent 1ba341b064 52de52a17a
commit c9b38314b5
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Model/SqlCriteria.php
View File

@ -70,6 +70,7 @@ class SqlCriteria
$this->sql_expression = 'SELECT ' . $select . ' FROM :table'; $this->sql_expression = 'SELECT ' . $select . ' FROM :table';
} }
$this->sql_expression .= ' ' . implode(' ', $this->sql_join_expressions); $this->sql_expression .= ' ' . implode(' ', $this->sql_join_expressions);
$this->sql_join_expressions = null;
} }
} }
@ -80,13 +81,16 @@ class SqlCriteria
public function count() public function count()
{ {
if ($this->sql_expression && strpos($this->sql_expression, 'COUNT(*) as count')) { $this->defineJoinExpressions();
; $sql_expression_backup = $this->sql_expression;
if ($this->sql_expression && !strstr('COUNT(*)', $this->sql_expression)) {
$this->sql_expression = preg_replace('#^SELECT .+ FROM#', 'SELECT COUNT(*) as count FROM', $this->sql_expression);
} else { } else {
$this->sql_expression = 'SELECT COUNT(*) as count FROM :table'; $this->sql_expression = 'SELECT COUNT(*) as count FROM :table';
} }
$this->defineJoinExpressions(); $count = $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'); $this->sql_expression = $sql_expression_backup;
return $count;
} }
private function defineJoinTablePlaceholder($table_name) private function defineJoinTablePlaceholder($table_name)