Remove src\TestSupport\TestQuoterTrait from yiisoft\db. (#185)

terabytesoftw · web-flow · commit 08cba8182d68 · 2022-12-17T17:31:33.000-03:00
* Remove src\TestSupport\TestQuoterTrait from yiisoft\db.
diff --git a/tests/Provider/QuoterProvider.php b/tests/Provider/QuoterProvider.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Pgsql\Tests\Provider;
+
+use Yiisoft\Db\Tests\Provider\AbstractQuoterProvider;
+
+final class QuoterProvider extends AbstractQuoterProvider
+{
+    public function tableNameParts(): array
+    {
+        return [
+            ['', ''],
+            ['[]', '[]'],
+            ['animal', 'animal'],
+            ['dbo.animal', 'animal', 'dbo'],
+            ['[dbo].[animal]', '[animal]', '[dbo]'],
+            ['[other].[animal2]', '[animal2]', '[other]'],
+            ['other.[animal2]', '[animal2]', 'other'],
+            ['other.animal2', 'animal2', 'other'],
+        ];
+    }
+}
diff --git a/tests/QuoterTest.php b/tests/QuoterTest.php
@@ -4,54 +4,23 @@
 
 namespace Yiisoft\Db\Pgsql\Tests;
 
-use Yiisoft\Db\TestSupport\TestQuoterTrait;
+use Yiisoft\Db\Pgsql\Tests\Support\TestTrait;
+use Yiisoft\Db\Tests\AbstractQuoterTest;
 
 /**
  * @group pgsql
+ *
+ * @psalm-suppress PropertyNotSetInConstructor
  */
-final class QuoterTest extends TestCase
+final class QuoterTest extends AbstractQuoterTest
 {
-    use TestQuoterTrait;
+    use TestTrait;
 
     /**
-     * @return string[][]
+     * @dataProvider \Yiisoft\Db\Pgsql\Tests\Provider\QuoterProvider::tableNameParts()
      */
-    public function simpleTableNamesProvider(): array
+    public function testGetTableNameParts(string $tableName, string ...$expected): void
     {
-        return [
-            ['test', 'test', ],
-            ['te`st', 'te`st', ],
-            ['te\'st', 'te\'st', ],
-            ['current-table-name', 'current-table-name', ],
-            ['"current-table-name"', 'current-table-name', ],
-        ];
-    }
-
-    /**
-     * @return string[][]
-     */
-    public function simpleColumnNamesProvider(): array
-    {
-        return [
-            ['test', '"test"', 'test'],
-            ['"test"', '"test"', 'test'],
-            ['*', '*', '*'],
-        ];
-    }
-
-    /**
-     * @return string[][]
-     */
-    public function columnNamesProvider(): array
-    {
-        return [
-            ['*', '*'],
-            ['table.*', '"table".*'],
-            ['"table".*', '"table".*'],
-            ['table.column', '"table"."column"'],
-            ['"table".column', '"table"."column"'],
-            ['table."column"', '"table"."column"'],
-            ['"table"."column"', '"table"."column"'],
-        ];
+        parent::testGetTableNameParts($tableName, ...$expected);
     }
 }
