Merge pull request #120 from tassoevan/develop

Ignore result columns when calling a aggregate function
j4mie · Aug 28, 2013 · b1d868a · b1d868a
2 parents 2a3758e + d1a02c5
commit b1d868a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/idiorm.php b/idiorm.php
@@ -629,8 +629,11 @@ protected function _call_aggregate_db_function($sql_function, $column) {
             if('*' != $column) {
                 $column = $this->_quote_identifier($column);
             }
+            $result_columns = $this->_result_columns;
+            $this->_result_columns = array();
             $this->select_expr("$sql_function($column)", $alias);
             $result = $this->find_one();
+            $this->_result_columns = $result_columns;
 
             $return_value = 0;
             if($result !== false && isset($result->$alias)) {

diff --git a/test/QueryBuilderTest.php b/test/QueryBuilderTest.php
@@ -477,6 +477,12 @@ public function testCount() {
         $expected = "SELECT COUNT(*) AS `count` FROM `widget` LIMIT 1";
         $this->assertEquals($expected, ORM::get_last_query());
     }
+
+    public function testIgnoreSelectAndCount() {
+    	ORM::for_table('widget')->select('test')->count();
+    	$expected = "SELECT COUNT(*) AS `count` FROM `widget` LIMIT 1";
+    	$this->assertEquals($expected, ORM::get_last_query());
+    }
 
     public function testMax() {
         ORM::for_table('person')->max('height');