Merge pull request #67 from homersimpsons/fix/bracket-expression-position

Fix bracket expression position

Author: moufmouf

src/SQLParser/Node/Expression.php

@@ -214,16 +214,15 @@ public function toSql(array $parameters, AbstractPlatform $platform, int $indent
             return null;
         }
 
+        if ($this->brackets) {
+            $sql = '('.$sql.')';
+        }
         if ($this->alias) {
             $sql .= ' AS '.$this->alias;
         }
         if ($this->direction) {
             $sql .= ' '.$this->direction;
         }
-        if ($this->brackets) {
-            $sql = '('.$sql.')';
-        }
-
 
         return $sql;
     }

tests/Mouf/Database/MagicQueryTest.php

@@ -196,6 +196,12 @@ public function testStandardSelect()
 
         $sql = 'SELECT 42 as fooalias FROM bar HAVING fooalias = 24';
         $this->assertEquals('SELECT 42 AS fooalias FROM bar HAVING fooalias = 24', self::simplifySql($magicQuery->build($sql)));
+
+        $sql = 'SELECT bar.foo FROM bar ORDER BY (bar.foo IS NULL) DESC, (bar.baz = 0) DESC, bar.id DESC';
+        $this->assertEquals($sql, self::simplifySql($magicQuery->build($sql)));
+
+        $sql = 'SELECT (id + 2) AS foo FROM bar';
+        $this->assertEquals($sql, self::simplifySql($magicQuery->build($sql)));
     }
 
     /**