Add Connection::getColumnBuilderClass() (#440)

Tigrov · web-flow · commit af7864f54151 · 2025-08-15T19:58:44.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -50,6 +50,7 @@
 - Enh #424, #425, #428: Adapt to conditions refactoring in `yiisoft/db` package (@vjik)
 - Enh #431: Remove `TableSchema` class and refactor `Schema` class (@Tigrov)
 - Enh #433: Support column's collation (@Tigrov)
+- New #440: Add `Connection::getColumnBuilderClass()` method (@Tigrov)
 
 ## 1.3.0 March 21, 2024
 
diff --git a/src/Connection.php b/src/Connection.php
@@ -7,6 +7,7 @@
 use Yiisoft\Db\Driver\Pdo\AbstractPdoConnection;
 use Yiisoft\Db\Driver\Pdo\PdoCommandInterface;
 use InvalidArgumentException;
+use Yiisoft\Db\Pgsql\Column\ColumnBuilder;
 use Yiisoft\Db\Pgsql\Column\ColumnFactory;
 use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
 use Yiisoft\Db\Schema\Column\ColumnFactoryInterface;
@@ -46,6 +47,11 @@ public function createTransaction(): TransactionInterface
         return new Transaction($this);
     }
 
+    public function getColumnBuilderClass(): string
+    {
+        return ColumnBuilder::class;
+    }
+
     public function getColumnFactory(): ColumnFactoryInterface
     {
         return $this->columnFactory ??= new ColumnFactory();
diff --git a/tests/ColumnBuilderTest.php b/tests/ColumnBuilderTest.php
@@ -4,7 +4,8 @@
 
 namespace Yiisoft\Db\Pgsql\Tests;
 
-use Yiisoft\Db\Pgsql\Column\ColumnBuilder;
+use PHPUnit\Framework\Attributes\DataProviderExternal;
+use Yiisoft\Db\Pgsql\Tests\Provider\ColumnBuilderProvider;
 use Yiisoft\Db\Pgsql\Tests\Support\TestTrait;
 use Yiisoft\Db\Tests\AbstractColumnBuilderTest;
 
@@ -15,14 +16,7 @@ final class ColumnBuilderTest extends AbstractColumnBuilderTest
 {
     use TestTrait;
 
-    public function getColumnBuilderClass(): string
-    {
-        return ColumnBuilder::class;
-    }
-
-    /**
-     * @dataProvider \Yiisoft\Db\Pgsql\Tests\Provider\ColumnBuilderProvider::buildingMethods
-     */
+    #[DataProviderExternal(ColumnBuilderProvider::class, 'buildingMethods')]
     public function testBuildingMethods(
         string $buildingMethod,
         array $args,
diff --git a/tests/ColumnTest.php b/tests/ColumnTest.php
@@ -40,8 +40,6 @@ final class ColumnTest extends CommonColumnTest
 {
     use TestTrait;
 
-    protected const COLUMN_BUILDER = ColumnBuilder::class;
-
     protected function insertTypeValues(ConnectionInterface $db): void
     {
         $db->createCommand()->insert(
diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
@@ -5,11 +5,8 @@
 namespace Yiisoft\Db\Pgsql\Tests;
 
 use PDO;
-use Throwable;
 use Yiisoft\Db\Connection\ConnectionInterface;
-use Yiisoft\Db\Exception\Exception;
-use Yiisoft\Db\Exception\InvalidConfigException;
-use Yiisoft\Db\Exception\NotSupportedException;
+use Yiisoft\Db\Pgsql\Column\ColumnBuilder;
 use Yiisoft\Db\Pgsql\Column\ColumnFactory;
 use Yiisoft\Db\Pgsql\Connection;
 use Yiisoft\Db\Pgsql\Tests\Support\TestTrait;
@@ -19,17 +16,11 @@
 
 /**
  * @group pgsql
- *
- * @psalm-suppress PropertyNotSetInConstructor
  */
 final class ConnectionTest extends CommonConnectionTest
 {
     use TestTrait;
 
-    /**
-     * @throws Exception
-     * @throws InvalidConfigException
-     */
     public function testInitConnection(): void
     {
         $db = $this->getConnection();
@@ -42,10 +33,6 @@ public function testInitConnection(): void
         $db->close();
     }
 
-    /**
-     * @throws Exception
-     * @throws InvalidConfigException
-     */
     public function testSettingDefaultAttributes(): void
     {
         $db = $this->getConnection();
@@ -67,12 +54,6 @@ public function testSettingDefaultAttributes(): void
         $db->close();
     }
 
-    /**
-     * @throws Exception
-     * @throws InvalidConfigException
-     * @throws NotSupportedException
-     * @throws Throwable
-     */
     public function testTransactionIsolation(): void
     {
         $db = $this->getConnection();
@@ -103,11 +84,6 @@ public function testTransactionIsolation(): void
         $db->close();
     }
 
-    /**
-     * @throws Exception
-     * @throws InvalidConfigException
-     * @throws Throwable
-     */
     public function testTransactionShortcutCustom(): void
     {
         $db = $this->getConnection(true);
@@ -137,6 +113,15 @@ static function (ConnectionInterface $db) {
         $db->close();
     }
 
+    public function getColumnBuilderClass(): void
+    {
+        $db = $this->getConnection();
+
+        $this->assertSame(ColumnBuilder::class, $db->getColumnBuilderClass());
+
+        $db->close();
+    }
+
     public function testGetColumnFactory(): void
     {
         $db = $this->getConnection();

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,6 @@ final class ColumnTest extends CommonColumnTest`
`40`	`40`	`{`
`41`	`41`	`use TestTrait;`
`42`	`42`
`43`		`- protected const COLUMN_BUILDER = ColumnBuilder::class;`
`44`		`-`
`45`	`43`	`protected function insertTypeValues(ConnectionInterface $db): void`
`46`	`44`	`{`
`47`	`45`	`$db->createCommand()->insert(`