Refactor insertBatch(), add getRawTableName() to QuoterInterface

yiisoft · May 5, 2024 · 466b4d0 · 466b4d0
1 parent ce1ddb5
commit 466b4d0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 22 deletions.
diff --git a/src/Command/AbstractCommand.php b/src/Command/AbstractCommand.php
@@ -212,14 +212,7 @@ public function batchInsert(string $table, array $columns, iterable $rows): stat
 
     public function insertBatch(string $table, iterable $rows, array $columns = []): static
     {
-        $table = $this->getQueryBuilder()->quoter()->quoteSql($table);
-
-        /** @psalm-var string[] $columns */
-        foreach ($columns as &$column) {
-            $column = $this->getQueryBuilder()->quoter()->quoteSql($column);
-        }
-
-        unset($column);
+        $table = $this->getQueryBuilder()->quoter()->getRawTableName($table);
 
         $params = [];
         $sql = $this->getQueryBuilder()->insertBatch($table, $rows, $columns, $params);

diff --git a/src/Schema/Quoter.php b/src/Schema/Quoter.php
@@ -83,16 +83,6 @@ public function cleanUpTableNames(array $tableNames): array
         return $cleanedUpTableNames;
     }
 
-    /**
-     * Returns the actual name of a given table name.
-     *
-     * This method will strip off curly brackets from the given table name and replace the percentage character '%' with
-     * {@see ConnectionInterface::tablePrefix}.
-     *
-     * @param string $name The table name to convert.
-     *
-     * @return string The real name of the given table name.
-     */
     public function getRawTableName(string $name): string
     {
         if (str_contains($name, '{{')) {

diff --git a/src/Schema/QuoterInterface.php b/src/Schema/QuoterInterface.php
@@ -26,6 +26,18 @@ interface QuoterInterface
      */
     public function cleanUpTableNames(array $tableNames): array;
 
+    /**
+     * Returns the actual name of a given table name.
+     *
+     * This method will strip off curly brackets from the given table name and replace the percentage character '%' with
+     * {@see ConnectionInterface::tablePrefix}.
+     *
+     * @param string $name The table name to convert.
+     *
+     * @return string The real name of the given table name.
+     */
+    public function getRawTableName(string $name): string;
+
     /**
      * Splits full table name into parts.
      *

diff --git a/tests/Db/Helper/DbArrayHelperTest.php b/tests/Db/Helper/DbArrayHelperTest.php
@@ -33,20 +33,20 @@ public function testPopulate(array $rows): void
      * @dataProvider \Yiisoft\Db\Tests\Provider\PopulateProvider::populateWithIncorrectIndexBy
      * @dataProvider \Yiisoft\Db\Tests\Provider\PopulateProvider::populateWithIndexByClosure
      */
-    public function testPopulateWithIndexBy(Closure|string|null $indexBy, array $rows, array $populated): void
+    public function testPopulateWithIndexBy(Closure|string|null $indexBy, array $rows, array $expected): void
     {
-        $this->assertSame($populated, DbArrayHelper::populate($rows, $indexBy));
+        $this->assertSame($expected, DbArrayHelper::populate($rows, $indexBy));
     }
 
     /**
      * @dataProvider \Yiisoft\Db\Tests\Provider\PopulateProvider::populateWithIndexBy
      */
-    public function testPopulateWithIndexByWithObject(Closure|string|null $indexBy, array $rows, array $expectedPopulated): void
+    public function testPopulateWithIndexByWithObject(Closure|string|null $indexBy, array $rows, array $expected): void
     {
         $rows = json_decode(json_encode($rows));
         $populated = json_decode(json_encode(DbArrayHelper::populate($rows, $indexBy)), true);
 
-        $this->assertSame($expectedPopulated, $populated);
+        $this->assertSame($expected, $populated);
     }
 
     /**