Improve test coverage (prepareInsertSelectSubQuery) (#451)

* Improve test coverage (prepareInsertSelectSubQuery) * Improve test coverage for Command * fix
yiisoft · Jan 4, 2023 · 1eff36d · 1eff36d
1 parent cfd508a
commit 1eff36d
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/src/QueryBuilder/DMLQueryBuilder.php b/src/QueryBuilder/DMLQueryBuilder.php
@@ -185,10 +185,16 @@ protected function prepareInsertSelectSubQuery(QueryInterface $columns, array $p
         foreach ($select as $title => $field) {
             if (is_string($title)) {
                 $names[] = $this->quoter->quoteColumnName($title);
-            } elseif (preg_match('/^(.*?)(?i:\s+as\s+|\s+)([\w\-_.]+)$/', $field, $matches)) {
-                $names[] = $this->quoter->quoteColumnName($matches[2]);
             } else {
-                $names[] = $this->quoter->quoteColumnName($field);
+                if ($field instanceof ExpressionInterface) {
+                    $field = $this->queryBuilder->buildExpression($field, $params);
+                }
+
+                if (preg_match('/^(.*?)(?i:\s+as\s+|\s+)([\w\-_.]+)$/', $field, $matches)) {
+                    $names[] = $this->quoter->quoteColumnName($matches[2]);
+                } else {
+                    $names[] = $this->quoter->quoteColumnName($field);
+                }
             }
         }
 

diff --git a/tests/Common/CommonCommandTest.php b/tests/Common/CommonCommandTest.php
@@ -111,6 +111,17 @@ public function testAddCommentOnTable(): void
         $this->assertSame($commentText, $commentOnTable);
     }
 
+    public function testResetSequenceSql(): void
+    {
+        $db = $this->getConnection(true);
+
+        $command = $db->createCommand();
+
+        $this->assertEmpty($command->getRawSql());
+        $command->resetSequence('{{%customer}}');
+        $this->assertNotEmpty($command->getRawSql());
+    }
+
     /**
      * @throws Exception
      * @throws InvalidConfigException

diff --git a/tests/Provider/AbstractQueryBuilderProvider.php b/tests/Provider/AbstractQueryBuilderProvider.php
@@ -995,6 +995,27 @@ public function insert(): array
                 ),
                 [],
             ],
+            'query' => [
+                'customer',
+                (new Query($db))
+                    ->select([new Expression('email as email'), new Expression('name')])
+                    ->from('customer')
+                    ->where(
+                        [
+                            'email' => 'test@example.com',
+                        ],
+                    ),
+                [],
+                DbHelper::replaceQuotes(
+                    <<<SQL
+                    INSERT INTO [[customer]] ([[email]], [[name]]) SELECT email as email, name FROM [[customer]] WHERE [[email]]=:qp0
+                    SQL,
+                    $db->getName(),
+                ),
+                [
+                    ':qp0' => 'test@example.com',
+                ],
+            ],
         ];
     }