Merge pull request #40 from moufmouf/count_multiple_columns

Fixing SQL generation of aggregate functions with multiple parameters

Author: moufmouf

.gitignore

@@ -1,3 +1,4 @@
 vendor/
 composer.lock
 phpunit.xml
+build/

src/SQLParser/Node/AggregateFunction.php

@@ -153,7 +153,7 @@ public function toInstanceDescriptor(MoufManager $moufManager)
      */
     public function toSql(array $parameters = array(), Connection $dbConnection = null, $indent = 0, $conditionsMode = self::CONDITION_APPLY)
     {
-        $subTreeSql = NodeFactory::toSql($this->subTree, $dbConnection, $parameters, ' ', false, $indent, $conditionsMode);
+        $subTreeSql = NodeFactory::toSql($this->subTree, $dbConnection, $parameters, ', ', false, $indent, $conditionsMode);
         if ($subTreeSql !== null) {
             $sql = $this->functionName.'(';
             $sql .= $subTreeSql;

tests/Mouf/Database/MagicQueryTest.php

@@ -155,6 +155,9 @@ public function testStandardSelect()
 
         $sql = 'SELECT country.* FROM country JOIN users ON country.id = users.country_id GROUP BY country.id ORDER BY COUNT(users.id) DESC';
         $this->assertEquals('SELECT country.* FROM country JOIN users ON (country.id = users.country_id) GROUP BY country.id ORDER BY COUNT(users.id) DESC', self::simplifySql($magicQuery->build($sql)));
+
+        $sql = 'SELECT COUNT(DISTINCT a, b) FROM users';
+        $this->assertEquals('SELECT COUNT(DISTINCT a, b) FROM users', self::simplifySql($magicQuery->build($sql)));
     }
 
     /**