Merge pull request #24 from cbalda/1.1

Fix empty array or null parameter in IN operand

Author: moufmouf

.travis.yml

@@ -1,15 +1,14 @@
 language: php
 
 php:
- - 5.5
+ - 5.6
+ - 7.0
 
 before_script:
- - wget http://getcomposer.org/composer.phar
- - php composer.phar install --no-interaction
+ - composer install --no-interaction
 
 script:
- - mkdir -p build/logs
- - phpunit --coverage-clover build/logs/clover.xml
+ - phpunit
 
 after_script:
  - php vendor/bin/coveralls -v

composer.json

@@ -22,8 +22,8 @@
         "twig/twig": "~1.14"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0",
-        "satooshi/php-coveralls": "dev-master",
+        "phpunit/phpunit": "~5.0",
+        "satooshi/php-coveralls": "~1.0",
         "doctrine/dbal": "~2.5"
     },
     "suggest": {

phpunit.xml.dist

@@ -27,4 +27,8 @@
             <directory suffix=".php">src/</directory>
         </whitelist>
     </filter>
+    <logging>
+        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+    </logging>
 </phpunit>

src/SQLParser/Node/In.php

@@ -1,6 +1,8 @@
 <?php
 
 namespace SQLParser\Node;
+use Doctrine\DBAL\Connection;
+use Mouf\Database\MagicQueryException;
 
 /**
  * This class represents an In operation in an SQL expression.
@@ -18,4 +20,19 @@ protected function getOperatorSymbol()
     {
         return 'IN';
     }
+
+    protected function getSql(array $parameters = array(), Connection $dbConnection = null, $indent = 0, $conditionsMode = self::CONDITION_APPLY)
+    {
+        $rightOperand = $this->getRightOperand();
+        if ($rightOperand instanceof Parameter) {
+            if (!isset($parameters[$rightOperand->getName()])) {
+                throw new MagicQueryException("Missing parameter '" . $rightOperand->getName() . "' for 'IN' operand.");
+            }
+            if ($parameters[$rightOperand->getName()] === []) {
+                return "FALSE";
+            }
+        }
+
+        return parent::getSql($parameters, $dbConnection, $indent, $conditionsMode);
+    }
 }

tests/Mouf/Database/MagicQueryTest.php

@@ -101,6 +101,19 @@ public function testStandardSelect()
         // Test CASE WHERE like SWITCH CASE
         $sql = "SELECT CASE status WHEN 'on' THEN '1' WHEN 'off' THEN '0' ELSE '-1' END AS my_case FROM users";
         $this->assertEquals("SELECT CASE status WHEN 'on' THEN '1' WHEN 'off' THEN '0' ELSE '-1' END AS my_case FROM users", self::simplifySql($magicQuery->build($sql)));
+
+        $sql = 'SELECT * FROM users WHERE status IN :statuses!';
+        $this->assertEquals('SELECT * FROM users WHERE FALSE', self::simplifySql($magicQuery->build($sql, ['statuses' => []])));
+    }
+
+    /**
+     * @expectedException \Mouf\Database\MagicQueryException
+     */
+    public function testInNullException() {
+        $magicQuery = new MagicQuery();
+
+        $sql = 'SELECT * FROM users WHERE status IN :statuses!';
+        $magicQuery->build($sql, ['statuses' => NULL]);
     }
 
     public function testWithCache()