Merge pull request #37 from dsavina/fix/order-by-aggregate-function

Fix : order by aggregate function

Author: moufmouf

.travis.yml

@@ -9,7 +9,7 @@ before_script:
  - composer install --no-interaction
 
 script:
- - phpunit
+ - vendor/bin/phpunit
 
 after_script:
  - php vendor/bin/coveralls -v

phpunit.xml.dist

@@ -13,7 +13,10 @@
 >
 
     <php>
-        <var name="db_url" value="mysql://root:@localhost/"/>
+        <var name="db_host" value="localhost" />
+        <var name="db_username" value="root" />
+        <var name="db_password" value="" />
+        <var name="db_driver" value="pdo_mysql"/>
     </php>
 
     <testsuites>

src/SQLParser/Node/AggregateFunction.php

@@ -105,6 +105,25 @@ public function setAlias($alias)
         $this->alias = $alias;
     }
 
+    private $direction;
+
+    public function getDirection()
+    {
+        return $this->direction;
+    }
+
+    /**
+     * Sets the direction.
+     *
+     * @Important
+     *
+     * @param string $direction
+     */
+    public function setDirection($direction)
+    {
+        $this->direction = $direction;
+    }
+
     /**
      * Returns a Mouf instance descriptor describing this object.
      *
@@ -145,6 +164,9 @@ public function toSql(array $parameters = array(), Connection $dbConnection = nu
 
                 $sql .= ' AS '.$alias;
             }
+            if ($this->direction) {
+                $sql .= ' '.$this->direction;
+            }
         } else {
             $sql = null;
         }

src/SQLParser/Node/NodeFactory.php

@@ -254,12 +254,17 @@ public static function toObject(array $desc)
                     $expr->setAlias($desc['alias']);
                 }
 
+                if (isset($desc['direction'])) {
+                    $expr->setDirection($desc['direction']);
+                }
+
                 // Debug:
                 unset($desc['base_expr']);
                 unset($desc['expr_type']);
                 unset($desc['sub_tree']);
                 unset($desc['alias']);
                 unset($desc['delim']);
+                unset($desc['direction']);
                 if (!empty($desc)) {
                     error_log('MagicQuery - NodeFactory: Unexpected parameters in aggregate function: '.var_export($desc, true));
                 }

tests/Mouf/Database/MagicQueryTest.php

@@ -152,6 +152,9 @@ public function testStandardSelect()
 
         $sql = 'SELECT * FROM users WHERE id IN (1, 3)';
         $this->assertEquals("SELECT * FROM users WHERE id IN (1, 3)", self::simplifySql($magicQuery->build($sql)));
+
+        $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)));
     }
 
     /**
@@ -177,12 +180,13 @@ public function testInvalidSql() {
     public function testWithCache()
     {
         global $db_url;
-        $config = new \Doctrine\DBAL\Configuration();
-        // TODO: put this in conf variable
         $connectionParams = array(
-            'url' => $db_url,
+            'user' => $GLOBALS['db_username'],
+            'password' => $GLOBALS['db_password'],
+            'host' => $GLOBALS['db_host'],
+            'driver' => $GLOBALS['db_driver'],
         );
-        $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config);
+        $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams);
 
         $cache = new ArrayCache();