Update tests

yiisoft · Sep 28, 2023 · 4daf4aa · 4daf4aa
1 parent 9f885ab
commit 4daf4aa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 32 deletions.
diff --git a/tests/AbstractQueryBuilderTest.php b/tests/AbstractQueryBuilderTest.php
@@ -1183,9 +1183,14 @@ public function testBuildWithQueryAlias($alias, $expected)
 
         [$sql, $params] = $qb->build($query);
 
-        $expected = DbHelper::replaceQuotes($expected, $db->getDriverName());
+        $expectedSql = DbHelper::replaceQuotes(
+            <<<SQL
+            WITH $expected AS (SELECT * FROM [[t]]) SELECT * FROM [[t]]
+            SQL,
+            $db->getDriverName(),
+        );
 
-        $this->assertSame($expected, $sql);
+        $this->assertSame($expectedSql, $sql);
         $this->assertSame([], $params);
     }
 

diff --git a/tests/Provider/QueryBuilderProvider.php b/tests/Provider/QueryBuilderProvider.php
@@ -1235,36 +1235,11 @@ public static function upsert(): array
     public static function cteAliases(): array
     {
         return [
-            'simple' => [
-                'a',
-                <<<SQL
-                WITH [[a]] AS (SELECT * FROM [[t]]) SELECT * FROM [[t]]
-                SQL,
-            ],
-            'with one column' => [
-                'a(b)',
-                <<<SQL
-                WITH [[a]]([[b]]) AS (SELECT * FROM [[t]]) SELECT * FROM [[t]]
-                SQL,
-            ],
-            'with columns' => [
-                'a(b,c,d)',
-                <<<SQL
-                WITH [[a]]([[b]], [[c]], [[d]]) AS (SELECT * FROM [[t]]) SELECT * FROM [[t]]
-                SQL,
-            ],
-            'with extra space' => [
-                'a(b,c,d) ',
-                <<<SQL
-                WITH a(b,c,d)  AS (SELECT * FROM [[t]]) SELECT * FROM [[t]]
-                SQL,
-            ],
-            'expression' => [
-                new Expression('a(b,c,d)'),
-                <<<SQL
-                WITH a(b,c,d) AS (SELECT * FROM [[t]]) SELECT * FROM [[t]]
-                SQL,
-            ],
+            'simple' => ['a', '[[a]]'],
+            'with one column' => ['a(b)', '[[a]]([[b]])'],
+            'with columns' => ['a(b,c,d)', '[[a]]([[b]], [[c]], [[d]])'],
+            'with extra space' => ['a(b,c,d) ', 'a(b,c,d) '],
+            'expression' => [new Expression('a(b,c,d)'), 'a(b,c,d)'],
         ];
     }
 }