Remove ColumnFactory from ColumnBuilder

CHANGELOG.md

@@ -12,6 +12,7 @@
 - Enh #347, #353: Raise minimum PHP version to `^8.1` with minor refactoring (@Tigrov)
 - Bug #349, #352: Restore connection if closed by connection timeout (@Tigrov)
 - Enh #354: Separate column type constants (@Tigrov)
+- Enh #355: Realize `ColumnBuilder` class (@Tigrov)
 
 ## 1.2.0 March 21, 2024
 

src/Column/ColumnBuilder.php

@@ -4,12 +4,6 @@
 
 namespace Yiisoft\Db\Mysql\Column;
 
-use Yiisoft\Db\Schema\Column\ColumnFactoryInterface;
-
 final class ColumnBuilder extends \Yiisoft\Db\Schema\Column\ColumnBuilder
 {
- public static function columnFactory(): ColumnFactoryInterface
- {
- return new ColumnFactory();
- }
 }

src/Connection.php

@@ -8,8 +8,9 @@
 use Throwable;
 use Yiisoft\Db\Driver\Pdo\AbstractPdoConnection;
 use Yiisoft\Db\Driver\Pdo\PdoCommandInterface;
-use Yiisoft\Db\Mysql\Column\ColumnBuilder;
+use Yiisoft\Db\Mysql\Column\ColumnFactory;
 use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
+use Yiisoft\Db\Schema\Column\ColumnFactoryInterface;
 use Yiisoft\Db\Schema\QuoterInterface;
 use Yiisoft\Db\Schema\SchemaInterface;
 use Yiisoft\Db\Transaction\TransactionInterface;
@@ -64,9 +65,9 @@ public function createTransaction(): TransactionInterface
  return new Transaction($this);
  }
 
- public function getColumnBuilderClass(): string
+ public function getColumnFactory(): ColumnFactoryInterface
  {
- return ColumnBuilder::class;
+ return new ColumnFactory();
  }
 
  public function getQueryBuilder(): QueryBuilderInterface

src/Schema.php

@@ -411,7 +411,7 @@ protected function getCreateTableSql(TableSchemaInterface $table): string
  */
  private function loadColumnSchema(array $info): ColumnSchemaInterface
  {
- $columnFactory = $this->db->getColumnBuilderClass()::columnFactory();
+ $columnFactory = $this->db->getColumnFactory();
 
  $dbType = $info['type'];
  /** @psalm-var ColumnInfoArray $info */

tests/ColumnBuilderTest.php

@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-use Yiisoft\Db\Mysql\Column\ColumnFactory;
+namespace Yiisoft\Db\Mysql\Tests;
+
+use Yiisoft\Db\Mysql\Column\ColumnBuilder;
 use Yiisoft\Db\Mysql\Tests\Support\TestTrait;
 use Yiisoft\Db\Tests\AbstractColumnBuilderTest;
 
@@ -13,11 +15,8 @@ class ColumnBuilderTest extends AbstractColumnBuilderTest
 {
  use TestTrait;
 
- public function testColumnFactory(): void
+ public function getColumnBuilderClass(): string
  {
- $db = $this->getConnection();
- $columnBuilderClass = $db->getColumnBuilderClass();
-
- $this->assertInstanceOf(ColumnFactory::class, $columnBuilderClass::columnFactory());
+ return ColumnBuilder::class;
  }
 }

tests/ConnectionTest.php

@@ -11,7 +11,7 @@
 use Yiisoft\Db\Exception\IntegrityException;
 use Yiisoft\Db\Exception\InvalidConfigException;
 use Yiisoft\Db\Exception\NotSupportedException;
-use Yiisoft\Db\Mysql\Column\ColumnBuilder;
+use Yiisoft\Db\Mysql\Column\ColumnFactory;
 use Yiisoft\Db\Mysql\Tests\Support\TestTrait;
 use Yiisoft\Db\Tests\Common\CommonConnectionTest;
 use Yiisoft\Db\Transaction\TransactionInterface;
@@ -158,10 +158,10 @@ public function testNotRestartConnectionOnTimeoutInTransaction(): void
  $db->createCommand('SELECT 1')->queryScalar();
  }
 
- public function testGetColumnBuilderClass(): void
+ public function testGetColumnFactory(): void
  {
  $db = $this->getConnection();
 
- $this->assertSame(ColumnBuilder::class, $db->getColumnBuilderClass());
+ $this->assertInstanceOf(ColumnFactory::class, $db->getColumnFactory());
  }
 }