Realize ColumnBuilder (#355)

yiisoft · Sep 16, 2024 · 30513b4 · 30513b4
1 parent d1b78b4
commit 30513b4
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 36 deletions.
diff --git a/CHANGELOG.md b/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
 

diff --git a/src/Column/ColumnBuilder.php b/src/Column/ColumnBuilder.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Mysql\Column;
+
+final class ColumnBuilder extends \Yiisoft\Db\Schema\Column\ColumnBuilder
+{
+}
diff --git a/src/Column/ColumnFactory.php b/src/Column/ColumnFactory.php
@@ -6,7 +6,6 @@
 
 use Yiisoft\Db\Constant\ColumnType;
 use Yiisoft\Db\Schema\Column\AbstractColumnFactory;
-use Yiisoft\Db\Schema\Column\ColumnSchemaInterface;
 
 final class ColumnFactory extends AbstractColumnFactory
 {
@@ -49,20 +48,6 @@ final class ColumnFactory extends AbstractColumnFactory
         'json' => ColumnType::JSON,
     ];
 
-    public function fromDefinition(string $definition, array $info = []): ColumnSchemaInterface
-    {
-        if (str_starts_with($definition, 'enum(')) {
-            preg_match('/^enum\(([^)]+)\)\s*/', $definition, $matches);
-            preg_match_all("/'([^']*)'/", $matches[1], $values);
-
-            $info['enum_values'] = $values[1];
-
-            return $this->fromDbType('enum', $info);
-        }
-
-        return parent::fromDefinition($definition, $info);
-    }
-
     protected function getType(string $dbType, array $info = []): string
     {
         $type = self::TYPE_MAP[$dbType] ?? ColumnType::STRING;
@@ -73,4 +58,9 @@ protected function getType(string $dbType, array $info = []): string
 
         return $type;
     }
+
+    protected function isDbType(string $dbType): bool
+    {
+        return isset(self::TYPE_MAP[$dbType]);
+    }
 }
diff --git a/src/Connection.php b/src/Connection.php
@@ -8,7 +8,9 @@
 use Throwable;
 use Yiisoft\Db\Driver\Pdo\AbstractPdoConnection;
 use Yiisoft\Db\Driver\Pdo\PdoCommandInterface;
+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;
@@ -63,6 +65,11 @@ public function createTransaction(): TransactionInterface
         return new Transaction($this);
     }
 
+    public function getColumnFactory(): ColumnFactoryInterface
+    {
+        return new ColumnFactory();
+    }
+
     public function getQueryBuilder(): QueryBuilderInterface
     {
         if ($this->queryBuilder === null) {

diff --git a/src/Schema.php b/src/Schema.php
@@ -15,9 +15,7 @@
 use Yiisoft\Db\Exception\NotSupportedException;
 use Yiisoft\Db\Expression\Expression;
 use Yiisoft\Db\Helper\DbArrayHelper;
-use Yiisoft\Db\Mysql\Column\ColumnFactory;
 use Yiisoft\Db\Schema\Builder\ColumnInterface;
-use Yiisoft\Db\Schema\Column\ColumnFactoryInterface;
 use Yiisoft\Db\Schema\Column\ColumnSchemaInterface;
 use Yiisoft\Db\Schema\TableSchemaInterface;
 
@@ -83,11 +81,6 @@ public function createColumn(string $type, array|int|string $length = null): Col
         return new Column($type, $length);
     }
 
-    public function getColumnFactory(): ColumnFactoryInterface
-    {
-        return new ColumnFactory();
-    }
-
     /**
      * Returns all unique indexes for the given table.
      *
@@ -418,9 +411,11 @@ protected function getCreateTableSql(TableSchemaInterface $table): string
      */
     private function loadColumnSchema(array $info): ColumnSchemaInterface
     {
+        $columnFactory = $this->db->getColumnFactory();
+
         $dbType = $info['type'];
         /** @psalm-var ColumnInfoArray $info */
-        $column = $this->getColumnFactory()->fromDefinition($dbType);
+        $column = $columnFactory->fromDefinition($dbType);
         $column->name($info['field']);
         $column->allowNull($info['null'] === 'YES');
         $column->primaryKey(str_contains($info['key'], 'PRI'));

diff --git a/tests/ColumnBuilderTest.php b/tests/ColumnBuilderTest.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Mysql\Tests;
+
+use Yiisoft\Db\Mysql\Column\ColumnBuilder;
+use Yiisoft\Db\Mysql\Tests\Support\TestTrait;
+use Yiisoft\Db\Tests\AbstractColumnBuilderTest;
+
+/**
+ * @group mysql
+ */
+class ColumnBuilderTest extends AbstractColumnBuilderTest
+{
+    use TestTrait;
+
+    public function getColumnBuilderClass(): string
+    {
+        return ColumnBuilder::class;
+    }
+}
diff --git a/tests/ColumnFactoryTest.php b/tests/ColumnFactoryTest.php
@@ -21,9 +21,23 @@ public function testFromDbType(string $dbType, string $expectedType, string $exp
     }
 
     /** @dataProvider \Yiisoft\Db\Mysql\Tests\Provider\ColumnFactoryProvider::definitions */
-    public function testFromDefinition(string $definition, string $expectedType, string $expectedInstanceOf, array $expectedInfo = []): void
-    {
-        parent::testFromDefinition($definition, $expectedType, $expectedInstanceOf, $expectedInfo);
+    public function testFromDefinition(
+        string $definition,
+        string $expectedType,
+        string $expectedInstanceOf,
+        array $expectedMethodResults = []
+    ): void {
+        parent::testFromDefinition($definition, $expectedType, $expectedInstanceOf, $expectedMethodResults);
+    }
+
+    /** @dataProvider \Yiisoft\Db\Mysql\Tests\Provider\ColumnFactoryProvider::pseudoTypes */
+    public function testFromPseudoType(
+        string $pseudoType,
+        string $expectedType,
+        string $expectedInstanceOf,
+        array $expectedMethodResults = []
+    ): void {
+        parent::testFromPseudoType($pseudoType, $expectedType, $expectedInstanceOf, $expectedMethodResults);
     }
 
     /** @dataProvider \Yiisoft\Db\Mysql\Tests\Provider\ColumnFactoryProvider::types */

diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
@@ -11,6 +11,7 @@
 use Yiisoft\Db\Exception\IntegrityException;
 use Yiisoft\Db\Exception\InvalidConfigException;
 use Yiisoft\Db\Exception\NotSupportedException;
+use Yiisoft\Db\Mysql\Column\ColumnFactory;
 use Yiisoft\Db\Mysql\Tests\Support\TestTrait;
 use Yiisoft\Db\Tests\Common\CommonConnectionTest;
 use Yiisoft\Db\Transaction\TransactionInterface;
@@ -156,4 +157,11 @@ public function testNotRestartConnectionOnTimeoutInTransaction(): void
 
         $db->createCommand('SELECT 1')->queryScalar();
     }
+
+    public function testGetColumnFactory(): void
+    {
+        $db = $this->getConnection();
+
+        $this->assertInstanceOf(ColumnFactory::class, $db->getColumnFactory());
+    }
 }
diff --git a/tests/Provider/ColumnFactoryProvider.php b/tests/Provider/ColumnFactoryProvider.php
@@ -55,7 +55,7 @@ public static function definitions(): array
     {
         $definitions = parent::definitions();
 
-        $definitions[] = ['bit(1)', ColumnType::BOOLEAN, BooleanColumnSchema::class, ['getSize' => 1]];
+        $definitions[] = ['bit(1)', ColumnType::BOOLEAN, BooleanColumnSchema::class, ['getDbType' => 'bit', 'getSize' => 1]];
 
         return $definitions;
     }

diff --git a/tests/SchemaTest.php b/tests/SchemaTest.php
@@ -17,7 +17,6 @@
 use Yiisoft\Db\Exception\NotSupportedException;
 use Yiisoft\Db\Expression\Expression;
 use Yiisoft\Db\Mysql\Column;
-use Yiisoft\Db\Mysql\Column\ColumnFactory;
 use Yiisoft\Db\Mysql\Schema;
 use Yiisoft\Db\Mysql\Tests\Support\TestTrait;
 use Yiisoft\Db\Query\Query;
@@ -566,12 +565,4 @@ public function testInsertDefaultValues()
             'numeric_col' => '-33.22',
         ], $row);
     }
-
-    public function testGetColumnFactory(): void
-    {
-        $db = $this->getConnection();
-        $factory = $db->getSchema()->getColumnFactory();
-
-        $this->assertInstanceOf(ColumnFactory::class, $factory);
-    }
 }