Fix ColumnDefinitionParser

CHANGELOG.md

@@ -39,10 +39,10 @@
 - Enh #875: Ignore "Packets out of order..." warnings in `AbstractPdoCommand::internalExecute()` method (@Tigrov)
 - Enh #877: Separate column type constants (@Tigrov)
 - New #878: Realize `ColumnBuilder` class (@Tigrov)
-- New #878, #900, #914: Realize `ColumnDefinitionParser` class (@Tigrov)
+- New #878, #900, #914, #922: Realize `ColumnDefinitionParser` class (@Tigrov)
 - Enh #881: Refactor `ColumnSchemaInterface` and `AbstractColumnSchema` (@Tigrov)
 - New #882: Move `ArrayColumnSchema` and `StructuredColumnSchema` classes from `db-pgsql` package (@Tigrov)
-- New #883, #901: Add `ColumnDefinitionBuilder` class and `QueryBuilderInterface::buildColumnDefinition()` method (@Tigrov)
+- New #883, #901, #922: Add `ColumnDefinitionBuilder` class and `QueryBuilderInterface::buildColumnDefinition()` method (@Tigrov)
 - Enh #885: Refactor `AbstractDsn` class (@Tigrov)
 - Chg #889: Update `AbstractDMLQueryBuilder::insertBatch()` method (@Tigrov)
 - Enh #890: Add properties of `AbstractColumnSchema` class to constructor (@Tigrov)

src/QueryBuilder/AbstractColumnDefinitionBuilder.php

@@ -254,10 +254,7 @@ protected function buildType(ColumnInterface $column): string
     {
         $dbType = $this->getDbType($column);
 
-        if (empty($dbType)
-            || $dbType[-1] === ')'
-            || !in_array(strtolower($dbType), static::TYPES_WITH_SIZE, true)
-        ) {
+        if (empty($dbType) || $dbType[-1] === ')' || !$this->isAllowSize($dbType)) {
             return $dbType;
         }
 
@@ -269,7 +266,7 @@ protected function buildType(ColumnInterface $column): string
 
         $scale = $column->getScale();
 
-        if ($scale === null || !in_array(strtolower($dbType), static::TYPES_WITH_SCALE, true)) {
+        if ($scale === null || !$this->isAllowScale($dbType)) {
             return "$dbType($size)";
         }
 
@@ -308,4 +305,20 @@ protected function getDefaultUuidExpression(): string
     {
         return '';
     }
+
+    /**
+     * Check if the database column type allow scale specification.
+     */
+    protected function isAllowScale(string $dbType): bool
+    {
+        return in_array(strtolower($dbType), static::TYPES_WITH_SCALE, true);
+    }
+
+    /**
+     * Check if the database column type allow size specification.
+     */
+    protected function isAllowSize(string $dbType): bool
+    {
+        return in_array(strtolower($dbType), static::TYPES_WITH_SIZE, true);
+    }
 }

src/Syntax/ColumnDefinitionParser.php

@@ -16,7 +16,7 @@
 /**
  * Parses column definition string. For example, `string(255)` or `int unsigned`.
  */
-final class ColumnDefinitionParser
+class ColumnDefinitionParser
 {
     /**
      * Parses column definition string.
@@ -62,7 +62,7 @@ public function parse(string $definition): array
     /**
      * @psalm-return array{enumValues: list<string>}
      */
-    private function enumInfo(string $values): array
+    protected function enumInfo(string $values): array
     {
         preg_match_all("/'([^']*)'/", $values, $matches);
 
@@ -80,7 +80,7 @@ private function enumInfo(string $values): array
      *     unsigned?: bool
      * }
      */
-    private function extraInfo(string $extra): array
+    protected function extraInfo(string $extra): array
     {
         if (empty($extra)) {
             return [];
@@ -137,7 +137,7 @@ private function extraInfo(string $extra): array
     /**
      * @psalm-return array{size: int, scale?: int}
      */
-    private function sizeInfo(string $size): array
+    protected function sizeInfo(string $size): array
     {
         $values = explode(',', $size);
 

tests/AbstractColumnDefinitionParserTest.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Yiisoft\Db\Syntax\ColumnDefinitionParser;
+use Yiisoft\Db\Tests\Support\TestTrait;
+
+/**
+ * @group db
+ */
+abstract class AbstractColumnDefinitionParserTest extends TestCase
+{
+    use TestTrait;
+
+    protected function createColumnDefinitionParser(): ColumnDefinitionParser
+    {
+        return new ColumnDefinitionParser();
+    }
+
+    /**
+     * @dataProvider \Yiisoft\Db\Tests\Provider\ColumnDefinitionParserProvider::parse
+     */
+    public function testParse(string $definition, array $expected): void
+    {
+        $parser = $this->createColumnDefinitionParser();
+
+        $this->assertSame($expected, $parser->parse($definition));
+    }
+}

tests/Db/Syntax/ColumnDefinitionParserTest.php

@@ -4,24 +4,11 @@
 
 namespace Yiisoft\Db\Tests\Db\Syntax;
 
-use PHPUnit\Framework\TestCase;
-use Yiisoft\Db\Syntax\ColumnDefinitionParser;
-use Yiisoft\Db\Tests\Support\TestTrait;
+use Yiisoft\Db\Tests\AbstractColumnDefinitionParserTest;
 
 /**
  * @group db
  */
-final class ColumnDefinitionParserTest extends TestCase
+final class ColumnDefinitionParserTest extends AbstractColumnDefinitionParserTest
 {
-    use TestTrait;
-
-    /**
-     * @dataProvider \Yiisoft\Db\Tests\Provider\ColumnDefinitionParserProvider::parse
-     */
-    public function testParse(string $definition, array $expected): void
-    {
-        $parser = new ColumnDefinitionParser();
-
-        $this->assertSame($expected, $parser->parse($definition));
-    }
 }