removing subtree from reserved node class.

Author: David Maechler

src/SQLParser/Node/NodeFactory.php

@@ -296,10 +296,6 @@ public static function toObject(array $desc)
                 $res = new Reserved();
                 $res->setBaseExpression($desc['base_expr']);
 
-                if (isset($desc['sub_tree'])) {
-                    $res->setSubTree(self::buildFromSubtree($desc['sub_tree']));
-                }
-
                 if ($desc['expr_type'] == ExpressionType::BRACKET_EXPRESSION) {
                     $res->setBrackets(true);
                 }

src/SQLParser/Node/Reserved.php

@@ -68,26 +68,6 @@ public function setBaseExpression($baseExpression)
         $this->baseExpression = $baseExpression;
     }
 
-    private $subTree;
-
-    public function getSubTree()
-    {
-        return $this->subTree;
-    }
-
-    /**
-     * Sets the subtree.
-     *
-     * @Important
-     *
-     * @param array<NodeInterface>|NodeInterface $subTree
-     */
-    public function setSubTree($subTree)
-    {
-        $this->subTree = $subTree;
-        $this->subTree = NodeFactory::simplify($this->subTree);
-    }
-
     private $brackets = false;
 
     /**
@@ -123,7 +103,6 @@ public function toInstanceDescriptor(MoufManager $moufManager)
     {
         $instanceDescriptor = $moufManager->createInstance(get_called_class());
         $instanceDescriptor->getProperty('baseExpression')->setValue(NodeFactory::nodeToInstanceDescriptor($this->baseExpression, $moufManager));
-        $instanceDescriptor->getProperty('subTree')->setValue(NodeFactory::nodeToInstanceDescriptor($this->subTree, $moufManager));
         $instanceDescriptor->getProperty('brackets')->setValue(NodeFactory::nodeToInstanceDescriptor($this->brackets, $moufManager));
 
         return $instanceDescriptor;
@@ -132,16 +111,15 @@ public function toInstanceDescriptor(MoufManager $moufManager)
     /**
      * Renders the object as a SQL string.
      *
+     * @param array $parameters
      * @param Connection $dbConnection
-     * @param array      $parameters
-     * @param number     $indent
-     * @param int        $conditionsMode
-     *
+     * @param int|number $indent
+     * @param int $conditionsMode
      * @return string
      */
     public function toSql(array $parameters = array(), Connection $dbConnection = null, $indent = 0, $conditionsMode = self::CONDITION_APPLY)
     {
-        $sql = NodeFactory::toSql($this->subTree, $dbConnection, $parameters, ' ', false, $indent, $conditionsMode);
+        $sql = '';
 
         if($this->baseExpression) {
             $sql .= ' '.$this->baseExpression.' ';
@@ -165,16 +143,6 @@ public function walk(VisitorInterface $visitor) {
         if ($result instanceof NodeInterface) {
             $node = $result;
         }
-        if ($result !== NodeTraverser::DONT_TRAVERSE_CHILDREN) {
-            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;
-                }
-            }
-        }
         return $visitor->leaveNode($node);
     }
 }