Merge branch 'master' into marin-3

yiisoft · May 16, 2024 · 9cc6635 · 9cc6635
2 parents 5fd4abc + 38df004
commit 9cc6635
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/bc.yml → .github/workflows/bc.yml_ b/.github/workflows/bc.yml → .github/workflows/bc.yml_
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Enh #320: Minor refactoring of `DDLQueryBuilder::getColumnDefinition()` method (@Tigrov)
 - Bug #320: Change visibility of `DDLQueryBuilder::getColumnDefinition()` method to `private` (@Tigrov)
 - Enh #321: Implement `SqlParser` and `ExpressionBuilder` driver classes (@Tigrov)
+- Chg #339: Replace call of `SchemaInterface::getRawTableName()` to `QuoterInterface::getRawTableName()` (@Tigrov)
 
 ## 1.2.0 March 21, 2024
 

diff --git a/src/Schema.php b/src/Schema.php
@@ -415,7 +415,7 @@ protected function findViewNames(string $schema = ''): array
      */
     protected function getCacheKey(string $name): array
     {
-        return array_merge([self::class], $this->generateCacheKey(), [$this->getRawTableName($name)]);
+        return array_merge([self::class], $this->generateCacheKey(), [$this->db->getQuoter()->getRawTableName($name)]);
     }
 
     /**

diff --git a/tests/CommandTest.php b/tests/CommandTest.php
@@ -70,13 +70,13 @@ public function testAlterColumn(): void
      */
     public function testBatchInsert(
         string $table,
-        array $columns,
         iterable $values,
+        array $columns,
         string $expected,
         array $expectedParams = [],
         int $insertedRow = 1
     ): void {
-        parent::testBatchInsert($table, $columns, $values, $expected, $expectedParams, $insertedRow);
+        parent::testBatchInsert($table, $values, $columns, $expected, $expectedParams, $insertedRow);
     }
 
     public function testDropCheck(): void

diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php
@@ -144,12 +144,12 @@ public function testAddUnique(string $name, string $table, array|string $columns
      */
     public function testBatchInsert(
         string $table,
-        array $columns,
         iterable $rows,
+        array $columns,
         string $expected,
         array $expectedParams = [],
     ): void {
-        parent::testBatchInsert($table, $columns, $rows, $expected, $expectedParams);
+        parent::testBatchInsert($table, $rows, $columns, $expected, $expectedParams);
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         protected function getCacheKey(string $name): array
         {
-            return array_merge([self::class], $this->generateCacheKey(), [$this->getRawTableName($name)]);
+            return array_merge([self::class], $this->generateCacheKey(), [$this->db->getQuoter()->getRawTableName($name)]);
         }
         /**
@@ Expand Down @@