Merge pull request #120 from tassoevan/develop

Ignore result columns when calling a aggregate function

2 files changed, 9 insertions, 0 deletions

diff --git a/idiorm.php b/idiorm.php
index 09b211c..5a86df2 100644
--- a/idiorm.php
+++ b/idiorm.php
@@ -629,8 +629,11 @@
             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
index bd888c0..6888c85 100644
--- a/test/QueryBuilderTest.php
+++ b/test/QueryBuilderTest.php
@@ -477,6 +477,12 @@ class QueryBuilderTest extends PHPUnit_Framework_TestCase {
         $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');