Adding support for CASE value WHEN.. THEN... constructs

Author: moufmouf

src/SQLParser/Node/NodeFactory.php

@@ -462,7 +462,6 @@ private static function buildFromSubtree($subTree)
             '||' => 'SQLParser\Node\OrOp',
             'OR' => 'SQLParser\Node\OrOp',
             'XOR' => 'SQLParser\Node\XorOp',
-            'WHEN' => 'SQLParser\Node\WhenConditions',
             'THEN' => 'SQLParser\Node\Then',
             'ELSE' => 'SQLParser\Node\ElseOperation'
     );
@@ -567,8 +566,13 @@ public static function simplify($nodes)
         $tmpOperators = $selectedOperators;
         $nextOperator = array_shift($tmpOperators);
 
+        $isSelectedOperatorFirst = null;
+
         foreach ($nodes as $node) {
             if ($node === $nextOperator) {
+                if ($isSelectedOperatorFirst === null) {
+                    $isSelectedOperatorFirst = true;
+                }
                 // Let's apply the "simplify" method on the operand before storing it.
                 //$operands[] = self::simplify($operand);
                 $simple = self::simplify($operand);
@@ -581,6 +585,9 @@ public static function simplify($nodes)
                 $operand = array();
                 $nextOperator = array_shift($tmpOperators);
             } else {
+                if ($isSelectedOperatorFirst === null) {
+                    $isSelectedOperatorFirst = false;
+                }
                 $operand[] = $node;
             }
         }
@@ -611,7 +618,6 @@ public static function simplify($nodes)
         array('INTERVAL'),
         array('BINARY', 'COLLATE'),
         array('!'),
-        array('CASE', 'WHEN', 'THEN', 'ELSE'),
         array('NOT'),
         */
 
@@ -649,19 +655,17 @@ public static function simplify($nodes)
             $instance->setMaxValueOperand($maxOperand);
 
             return $instance;
-        /*} elseif ($operation === 'WHEN') {
-            $when = array_shift($operands);
+        } elseif ($operation === 'WHEN') {
 
-            $whenOperands = $when->getOperands();
-            $condition = array_shift($whenOperands);
-            $result = array_shift($whenOperands);
+            $instance = new WhenConditions();
 
-            $instance = new WhenThen();
-            $instance->setCondition($condition);
-            $instance->setResult($result);
+            if (!$isSelectedOperatorFirst) {
+                $value = array_shift($operands);
+                $instance->setValue($value);
+            }
+            $instance->setOperands($operands);
 
             return $instance;
-*/
         } elseif ($operation === 'CASE') {
             $innerOperation = array_shift($operands);
 

src/SQLParser/Node/WhenConditions.php

@@ -10,12 +10,32 @@
 use SQLParser\Node\Traverser\VisitorInterface;
 
 /**
- * This class represents a set of WHEN ... THEN ... construct (inside a CASE).
+ * This class represents a set of ... WHEN ... THEN ... construct (inside a CASE).
  *
  * @author David Négrier <[email protected]>
  */
 class WhenConditions extends AbstractManyInstancesOperator
 {
+
+    private $value;
+
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    /**
+     * Sets the value.
+     *
+     * @Important
+     *
+     * @param NodeInterface|NodeInterface[]|string $value
+     */
+    public function setValue($value)
+    {
+        $this->value = $value;
+    }
+
     /**
      * Renders the object as a SQL string.
      *
@@ -29,6 +49,11 @@ class WhenConditions extends AbstractManyInstancesOperator
     public function toSql(array $parameters = array(), Connection $dbConnection = null, $indent = 0, $conditionsMode = self::CONDITION_APPLY)
     {
         $fullSql = '';
+
+        if ($this->value) {
+            $fullSql = NodeFactory::toSql($this->value, $dbConnection, $parameters, ' ', false, $indent, $conditionsMode);
+        }
+
         foreach ($this->getOperands() as $operand) {
             $sql = NodeFactory::toSql($operand, $dbConnection, $parameters, ' ', false, $indent, $conditionsMode);
             if ($sql != null) {

tests/Mouf/Database/MagicQueryTest.php

@@ -92,6 +92,11 @@ public function testStandardSelect()
         // Test CASE WHERE
         $sql = "SELECT CASE WHEN status = 'on' THEN '1' WHEN status = 'off' THEN '0' ELSE '-1' END AS my_case FROM users";
         $this->assertEquals("SELECT CASE WHEN status = 'on' THEN '1' WHEN status = 'off' THEN '0' ELSE '-1' END AS my_case FROM users", self::simplifySql($magicQuery->build($sql)));
+
+        // 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)));
+
     }
 
     public function testWithCache() {