Adapt test for changes in db (#366)

Author: Tigrov

tests/Provider/QueryBuilderProvider.php

@@ -10,6 +10,8 @@
 use Yiisoft\Db\Constant\PseudoType;
 use Yiisoft\Db\Constant\ReferentialAction;
 use Yiisoft\Db\Constraint\ForeignKey;
+use Yiisoft\Db\Expression\Statement\CaseX;
+use Yiisoft\Db\Expression\Statement\When;
 use Yiisoft\Db\Expression\Value\ArrayExpression;
 use Yiisoft\Db\Expression\Expression;
 use Yiisoft\Db\Expression\Function\ArrayMerge;
@@ -455,13 +457,17 @@ public static function prepareValue(): array
         return $values;
     }
 
-    public static function caseExpressionBuilder(): array
+    public static function caseXBuilder(): array
     {
-        $data = parent::caseExpressionBuilder();
+        $data = parent::caseXBuilder();
 
         $data['with case expression'] = [
-            $data['with case expression'][0]->else(
-                new Expression('to_number(:qp0)', [':qp0' => $param = new Param(4, DataType::INTEGER)])
+            $data['with case expression'][0] = new CaseX(
+                '(1 + 2)',
+                when1: new When(1, 1),
+                when2: new When(2, new Expression('2')),
+                when3: new When(3, '(2 + 1)'),
+                else: new Expression('to_number(:qp0)', [':qp0' => $param = new Param(4, DataType::INTEGER)]),
             ),
             'CASE (1 + 2) WHEN 1 THEN 1 WHEN 2 THEN 2 WHEN 3 THEN (2 + 1) ELSE to_number(:qp0) END',
             [':qp0' => $param],

tests/QueryBuilderTest.php

@@ -12,7 +12,7 @@
 use InvalidArgumentException;
 use Yiisoft\Db\Exception\NotSupportedException;
 use Yiisoft\Db\Expression\Value\ArrayExpression;
-use Yiisoft\Db\Expression\Statement\CaseExpression;
+use Yiisoft\Db\Expression\Statement\CaseX;
 use Yiisoft\Db\Expression\ExpressionInterface;
 use Yiisoft\Db\Expression\Function\ArrayMerge;
 use Yiisoft\Db\Expression\Value\Param;
@@ -578,14 +578,14 @@ public function testDropTable(string $expected, ?bool $ifExists, ?bool $cascade)
         parent::testDropTable($expected, $ifExists, $cascade);
     }
 
-    #[DataProviderExternal(QueryBuilderProvider::class, 'caseExpressionBuilder')]
-    public function testCaseExpressionBuilder(
-        CaseExpression $case,
+    #[DataProviderExternal(QueryBuilderProvider::class, 'caseXBuilder')]
+    public function testCaseXBuilder(
+        CaseX $case,
         string $expectedSql,
         array $expectedParams,
         string|int $expectedResult,
     ): void {
-        parent::testCaseExpressionBuilder($case, $expectedSql, $expectedParams, $expectedResult);
+        parent::testCaseXBuilder($case, $expectedSql, $expectedParams, $expectedResult);
     }
 
     #[DataProviderExternal(QueryBuilderProvider::class, 'lengthBuilder')]