Merge pull request #36 from gulien/fixInList

Fixing IN list

Author: moufmouf

.travis.yml

@@ -3,6 +3,7 @@ language: php
 php:
  - 5.6
  - 7.0
+ - 7.1
 
 before_script:
  - composer install --no-interaction

src/SQLParser/Node/Expression.php

@@ -149,6 +149,28 @@ public function setBrackets($brackets)
         $this->brackets = $brackets;
     }
 
+    private $delimiter = ' ';
+
+    /**
+     * @return string
+     */
+    public function getDelimiter()
+    {
+        return $this->delimiter;
+    }
+
+    /**
+     * Sets the delimiter for the list. Defaults to ' '.
+     *
+     * @param string $delimiter
+     */
+    public function setDelimiter($delimiter)
+    {
+        $this->delimiter = $delimiter;
+    }
+
+
+
     /**
      * Returns a Mouf instance descriptor describing this object.
      *
@@ -164,6 +186,7 @@ public function toInstanceDescriptor(MoufManager $moufManager)
         $instanceDescriptor->getProperty('alias')->setValue(NodeFactory::nodeToInstanceDescriptor($this->alias, $moufManager));
         $instanceDescriptor->getProperty('direction')->setValue(NodeFactory::nodeToInstanceDescriptor($this->direction, $moufManager));
         $instanceDescriptor->getProperty('brackets')->setValue(NodeFactory::nodeToInstanceDescriptor($this->brackets, $moufManager));
+        $instanceDescriptor->getProperty('delimiter')->setValue(NodeFactory::nodeToInstanceDescriptor($this->delimiter, $moufManager));
 
         return $instanceDescriptor;
     }
@@ -180,7 +203,7 @@ public function toInstanceDescriptor(MoufManager $moufManager)
      */
     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 = NodeFactory::toSql($this->subTree, $dbConnection, $parameters, $this->delimiter, false, $indent, $conditionsMode);
 
         if ($sql === null) {
             return null;

src/SQLParser/Node/NodeFactory.php

@@ -371,6 +371,11 @@ public static function toObject(array $desc)
                     $expr->setBrackets(true);
                 }
 
+                if ($desc['expr_type'] == ExpressionType::IN_LIST) {
+                    $expr->setBrackets(true);
+                    $expr->setDelimiter(',');
+                }
+
                 // Debug:
                 unset($desc['base_expr']);
                 unset($desc['expr_type']);

tests/Mouf/Database/MagicQueryTest.php

@@ -150,6 +150,8 @@ public function testStandardSelect()
             'date' => '2016-01-01'
         ])));
 
+        $sql = 'SELECT * FROM users WHERE id IN (1, 3)';
+        $this->assertEquals("SELECT * FROM users WHERE id IN (1, 3)", self::simplifySql($magicQuery->build($sql)));
     }
 
     /**