Refactor ColumnDefinitionParser

.github/workflows/mutation.yml

@@ -70,6 +70,6 @@ jobs:
 
       - name: Run infection.
         run: |
-          vendor/bin/roave-infection-static-analysis-plugin --threads=2 --ignore-msi-with-no-mutations --only-covered
+          vendor/bin/roave-infection-static-analysis-plugin --threads=2 --ignore-msi-with-no-mutations
         env:
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}

CHANGELOG.md

@@ -55,6 +55,7 @@
 - Chg #428: Update expression namespaces according to changes in `yiisoft/db` package (@Tigrov)
 - Enh #432, #433: Update `DMLQueryBuilder::update()` method to adapt changes in `yiisoft/db` (@rustamwin, @Tigrov)
 - Enh #439: Move "Packets out of order" warning suppression from Yii DB (@vjik)
+- Chg #447: Refactor `ColumnDefinitionParser` (@vjik)
 
 ## 1.2.0 March 21, 2024
 

src/Column/ColumnDefinitionParser.php

@@ -4,6 +4,8 @@
 
 namespace Yiisoft\Db\Mysql\Column;
 
+use Yiisoft\Db\Syntax\AbstractColumnDefinitionParser;
+
 /**
  * Parses column definition string. For example, `string(255)` or `int unsigned`.
  *
@@ -19,11 +21,11 @@
  *     unsigned?: bool
  * }
  */
-final class ColumnDefinitionParser extends \Yiisoft\Db\Syntax\ColumnDefinitionParser
+final class ColumnDefinitionParser extends AbstractColumnDefinitionParser
 {
     /**
-     * @psalm-return ExtraInfo
-     * @psalm-suppress ImplementedReturnTypeMismatch, InvalidReturnType, InvalidReturnStatement
+     * @inheritDoc
+     * @psalm-suppress InvalidReturnType, InvalidReturnStatement
      */
     protected function extraInfo(string $extra): array
     {
@@ -44,4 +46,40 @@ protected function extraInfo(string $extra): array
 
         return $info;
     }
+
+    protected function parseTypeParams(string $type, string $params): array
+    {
+        return match ($type) {
+            'bit',
+            'bigint',
+            'binary',
+            'char',
+            'decimal',
+            'double',
+            'float',
+            'int',
+            'integer',
+            'mediumint',
+            'numeric',
+            'real',
+            'smallint',
+            'string',
+            'tinyint',
+            'varbinary',
+            'varchar',
+            'year' => $this->parseSizeInfo($params),
+            'enum' => $this->parseEnumValues($params),
+            default => [],
+        };
+    }
+
+    /**
+     * @psalm-return array{enumValues: list<string>}
+     */
+    protected function parseEnumValues(string $params): array
+    {
+        preg_match_all("/'([^']*)'/", $params, $matches);
+
+        return ['enumValues' => $matches[1]];
+    }
 }

tests/ColumnDefinitionParserTest.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Mysql\Tests;
+
+use PHPUnit\Framework\Attributes\DataProviderExternal;
+use Yiisoft\Db\Mysql\Column\ColumnDefinitionParser;
+use Yiisoft\Db\Mysql\Tests\Provider\ColumnDefinitionParserProvider;
+use Yiisoft\Db\Syntax\ColumnDefinitionParserInterface;
+use Yiisoft\Db\Tests\Common\CommonColumnDefinitionParserTest;
+
+/**
+ * @group mysql
+ */
+final class ColumnDefinitionParserTest extends CommonColumnDefinitionParserTest
+{
+    #[DataProviderExternal(ColumnDefinitionParserProvider::class, 'parse')]
+    public function testParse(string $definition, array $expected): void
+    {
+        parent::testParse($definition, $expected);
+    }
+
+    protected function createColumnDefinitionParser(): ColumnDefinitionParserInterface
+    {
+        return new ColumnDefinitionParser();
+    }
+}

tests/Provider/ColumnDefinitionParserProvider.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Mysql\Tests\Provider;
+
+final class ColumnDefinitionParserProvider extends \Yiisoft\Db\Tests\Provider\ColumnDefinitionParserProvider
+{
+    public static function parse(): array
+    {
+        return [
+            ...parent::parse(),
+            ["enum('a','b','c')", ['type' => 'enum', 'enumValues' => ['a', 'b', 'c']]],
+            ["enum('a','b','c') NOT NULL", ['type' => 'enum', 'enumValues' => ['a', 'b', 'c'], 'notNull' => true]],
+        ];
+    }
+}