Fix ColumnDefinitionParser

CHANGELOG.md

@@ -26,6 +26,7 @@
 - Enh #378: Improve loading schemas of views (@Tigrov)
 - Enh #379: Remove `ColumnInterface` (@Tigrov)
 - Enh #380: Rename `ColumnSchemaInterface` to `ColumnInterface` (@Tigrov)
+- Enh #381: Add `ColumnDefinitionParser` class (@Tigrov)
 
 ## 1.3.0 March 21, 2024
 

src/Column/ColumnDefinitionParser.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Pgsql\Column;
+
+use function preg_match;
+use function strlen;
+use function strtolower;
+use function substr;
+
+/**
+ * Parses column definition string. For example, `string(255)` or `int unsigned`.
+ */
+final class ColumnDefinitionParser extends \Yiisoft\Db\Syntax\ColumnDefinitionParser
+{
+    private const TYPE_PATTERN = '/^('
+        . 'time(?:stamp)?\s*(?:\((\d+)\))? with(?:out)? time zone'
+        . ')|('
+        . '(?:character|bit) varying'
+        . '|double precision'
+        . '|\w*'
+        . ')(?:\(([^)]+)\))?\s*/i';
+
+    public function parse(string $definition): array
+    {
+        preg_match(self::TYPE_PATTERN, $definition, $matches);
+
+        $type = strtolower($matches[3] ?? $matches[1]);
+        $info = ['type' => $type];
+
+        $typeDetails = $matches[4] ?? $matches[2] ?? '';
+
+        if ($typeDetails !== '') {
+            if ($type === 'enum') {
+                $info += $this->enumInfo($typeDetails);
+            } else {
+                $info += $this->sizeInfo($typeDetails);
+            }
+        }
+
+        $extra = substr($definition, strlen($matches[0]));
+
+        return $info + $this->extraInfo($extra);
+    }
+}

src/Column/ColumnFactory.php

@@ -139,6 +139,11 @@
         return $column;
     }
 
+    protected function columnDefinitionParser(): ColumnDefinitionParser
+    {
+        return new ColumnDefinitionParser();
+    }
+
     protected function getColumnClass(string $type, array $info = []): string
     {
         return match ($type) {
@@ -162,7 +167,7 @@
         $value = preg_replace("/::[^:']+$/", '$1', $defaultValue);
 
         if (str_starts_with($value, "B'") && $value[-1] === "'") {
             return $column->phpTypecast(substr($value, 2, -1));
         }
 
         $value = parent::normalizeNotNullDefaultValue($value, $column);

tests/ColumnDefinitionParserTest.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Pgsql\Tests;
+
+use Yiisoft\Db\Pgsql\Column\ColumnDefinitionParser;
+use Yiisoft\Db\Tests\AbstractColumnDefinitionParserTest;
+
+/**
+ * @group pgsql
+ */
+final class ColumnDefinitionParserTest extends AbstractColumnDefinitionParserTest
+{
+    protected function createColumnDefinitionParser(): ColumnDefinitionParser
+    {
+        return new ColumnDefinitionParser();
+    }
+
+    /**
+     * @dataProvider \Yiisoft\Db\Pgsql\Tests\Provider\ColumnDefinitionParserProvider::parse
+     */
+    public function testParse(string $definition, array $expected): void
+    {
+        parent::testParse($definition, $expected);
+    }
+}

tests/Provider/ColumnDefinitionParserProvider.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Pgsql\Tests\Provider;
+
+class ColumnDefinitionParserProvider extends \Yiisoft\Db\Tests\Provider\ColumnDefinitionParserProvider
+{
+    public static function parse(): array
+    {
+        return [
+            ...parent::parse(),
+            ['double precision', ['type' => 'double precision']],
+            ['character varying(126)', ['type' => 'character varying', 'size' => 126]],
+            ['bit varying(8)', ['type' => 'bit varying', 'size' => 8]],
+            ['timestamp without time zone', ['type' => 'timestamp without time zone']],
+            ['timestamp(3) with time zone', ['type' => 'timestamp(3) with time zone', 'size' => 3]],
+            ['time without time zone', ['type' => 'time without time zone']],
+            ['time (3) with time zone', ['type' => 'time (3) with time zone', 'size' => 3]],
+        ];
+    }
+}