Merge pull request #72 from moufmouf/oracle_aliases

Subquery aliases in Oracle don't accept the AS keyword
thecodingmachine · Aug 3, 2020 · d4940bd · d4940bd
2 parents fda2a02 + 6afd03a
commit d4940bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/SQLParser/Node/SubQuery.php b/src/SQLParser/Node/SubQuery.php
@@ -196,7 +196,7 @@ public function toSql(array $parameters, AbstractPlatform $platform, int $indent
         }
         $sql .= '('.$this->subQuery->toSql($parameters, $platform, $indent, $conditionsMode, $extrapolateParameters).')';
         if ($this->alias) {
-            $sql .= ' AS '.$platform->quoteSingleIdentifier($this->alias);
+            $sql .= ' '.$platform->quoteSingleIdentifier($this->alias);
         }
         if ($this->refClause) {
             $sql .= ' ON ';

diff --git a/tests/Mouf/Database/MagicQueryTest.php b/tests/Mouf/Database/MagicQueryTest.php
@@ -205,6 +205,9 @@ public function testStandardSelect()
 
         $sql = 'SELECT COUNT(*) FROM (SELECT DISTINCT states.country_id, states.code FROM states)';
         $this->assertEquals($sql, self::simplifySql($magicQuery->build($sql)));
+
+        $sql = 'SELECT COUNT(*) AS cnt FROM (SELECT id FROM country) subquery';
+        $this->assertEquals($sql, self::simplifySql($magicQuery->build($sql)));
     }
 
     /**