Merge branch 'cbalda-1.1' into 1.1

Author: cbalda

src/SQLParser/Node/Expression.php

@@ -208,12 +208,21 @@ public function walk(VisitorInterface $visitor)
             $node = $result;
         }
         if ($result !== NodeTraverser::DONT_TRAVERSE_CHILDREN) {
-            foreach ($this->subTree as $key => $operand) {
-                $result2 = $operand->walk($visitor);
+            if (is_array($this->subTree)) {
+                foreach ($this->subTree as $key => $operand) {
+                    $result2 = $operand->walk($visitor);
+                    if ($result2 === NodeTraverser::REMOVE_NODE) {
+                        unset($this->subTree[$key]);
+                    } elseif ($result2 instanceof NodeInterface) {
+                        $this->subTree[$key] = $result2;
+                    }
+                }
+            } else {
+                $result2 = $this->subTree->walk($visitor);
                 if ($result2 === NodeTraverser::REMOVE_NODE) {
-                    unset($this->subTree[$key]);
+                    $this->subTree = [];
                 } elseif ($result2 instanceof NodeInterface) {
-                    $this->subTree[$key] = $result2;
+                    $this->subTree = $result2;
                 }
             }
         }

src/SQLParser/Node/NodeFactory.php

@@ -33,6 +33,7 @@
 namespace SQLParser\Node;
 
 use Mouf\Database\MagicQueryException;
+use Mouf\Database\MagicQueryParserException;
 use SQLParser\SqlRenderInterface;
 use Doctrine\DBAL\Connection;
 use Mouf\MoufManager;
@@ -631,6 +632,12 @@ public static function simplify($nodes)
             $instance->setLeftOperand($leftOperand);
             $instance->setRightOperand($rightOperand);
 
+            $leftOperand = array_shift($operands);
+            $rightOperand = array_shift($operands);
+            $instance = new self::$OPERATOR_TO_CLASS[$operation]();
+            $instance->setLeftOperand($leftOperand);
+            $instance->setRightOperand($rightOperand);
+
             return $instance;
         } elseif (isset(self::$OPERATOR_TO_CLASS[$operation]) && is_subclass_of(self::$OPERATOR_TO_CLASS[$operation], 'SQLParser\Node\AbstractManyInstancesOperator')) {
             $instance = new self::$OPERATOR_TO_CLASS[$operation]();

tests/Mouf/Database/MagicQueryTest.php

@@ -158,7 +158,7 @@ public function testParseError()
         $magicQuery->build($sql);
     }
 
-    public function testMagicJoin()
+    private function getSchema()
     {
         $schema = new Schema();
         $role = $schema->createTable('role');
@@ -175,6 +175,12 @@ public function testMagicJoin()
         $role_right->addForeignKeyConstraint($schema->getTable('role'), array('role_id'), array('id'), array('onUpdate' => 'CASCADE'));
         $role_right->addForeignKeyConstraint($schema->getTable('right'), array('right_id'), array('id'), array('onUpdate' => 'CASCADE'));
         $role_right->setPrimaryKey(['role_id', 'right_id']);
+        return $schema;
+    }
+
+    public function testMagicJoin()
+    {
+        $schema = $this->getSchema();
 
         $schemaAnalyzer = new SchemaAnalyzer(new StubSchemaManager($schema));
 
@@ -185,6 +191,19 @@ public function testMagicJoin()
         $this->assertEquals($expectedSql, self::simplifySql($magicQuery->build($sql)));
     }
 
+    public function testMagicJoinNodeWalker()
+    {
+        $schema = $this->getSchema();
+
+        $schemaAnalyzer = new SchemaAnalyzer(new StubSchemaManager($schema));
+
+        $magicQuery = new MagicQuery(null, null, $schemaAnalyzer);
+
+        $sql = "SELECT role.* FROM magicjoin(role) WHERE role.label = 'my_role' AND (right.label LIKE '%test%' OR right.label LIKE '%testBis%')";
+        $expectedSql = "SELECT role.* FROM role LEFT JOIN role_right ON (role_right.role_id = role.id) LEFT JOIN right ON (role_right.right_id = right.id) WHERE (role.label = 'my_role') AND (((right.label LIKE '%test%') OR (right.label LIKE '%testBis%')))";
+        $this->assertEquals($expectedSql, self::simplifySql($magicQuery->build($sql)));
+    }
+
     public function testMagicJoin2()
     {
         $schema = new Schema();
@@ -300,4 +319,4 @@ private static function simplifySql($sql)
 
         return $sql;
     }
-}
+}