Fix ColumnDefinitionParser

CHANGELOG.md

@@ -15,7 +15,7 @@
 - Enh #279: Separate column type constants (@Tigrov)
 - New #280, #291: Realize `ColumnBuilder` class (@Tigrov)
 - Enh #281: Update according changes in `ColumnSchemaInterface` (@Tigrov)
-- New #282, #291: Add `ColumnDefinitionBuilder` class (@Tigrov)
+- New #282, #291, #299: Add `ColumnDefinitionBuilder` class (@Tigrov)
 - Bug #285: Fix `DMLQueryBuilder::insertBatch()` method (@Tigrov)
 - Enh #283: Refactor `Dsn` class (@Tigrov)
 - Enh #286: Use constructor to create columns and initialize properties (@Tigrov)
@@ -27,6 +27,7 @@
 - Enh #296: Remove `ColumnInterface` (@Tigrov)
 - Enh #298: Rename `ColumnSchemaInterface` to `ColumnInterface` (@Tigrov)
 - Enh #298: Refactor `DMLQueryBuilder::prepareInsertValues()` method (@Tigrov)
+- Enh #299: Add `ColumnDefinitionParser` class (@Tigrov)
 
 ## 1.3.0 March 21, 2024
 

src/Column/ColumnDefinitionBuilder.php

@@ -9,7 +9,10 @@
 use Yiisoft\Db\Schema\Column\ColumnInterface;
 
 use function ceil;
+use function in_array;
 use function log10;
+use function preg_replace;
+use function strtolower;
 use function strtoupper;
 
 final class ColumnDefinitionBuilder extends AbstractColumnDefinitionBuilder
@@ -26,7 +29,7 @@ final class ColumnDefinitionBuilder extends AbstractColumnDefinitionBuilder
         'number',
         'float',
         'timestamp',
-        'interval day(0) to second',
+        'interval day to second',
         'raw',
         'urowid',
     ];
@@ -102,4 +105,9 @@ protected function getDefaultUuidExpression(): string
     {
         return 'sys_guid()';
     }
+
+    protected function isAllowSize(string $dbType): bool
+    {
+        return in_array(strtolower(preg_replace('/\([^)]+\)/', '', $dbType)), self::TYPES_WITH_SIZE, true);
+    }
 }

src/Column/ColumnDefinitionParser.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Oracle\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 = '/^('
+        . 'timestamp\s*(?:\((\d+)\))? with(?: local)? time zone'
+        . '|interval year\s*(?:\(\d+\))? to month'
+        . ')|('
+        . 'interval day\s*(?:\(\d+\))? to second'
+        . '|\w*'
+        . ')\s*(?:\(([^)]+)\))?\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

@@ -49,6 +49,11 @@ final class ColumnFactory extends AbstractColumnFactory
         'long' => ColumnType::TEXT,
     ];
 
+    protected function columnDefinitionParser(): ColumnDefinitionParser
+    {
+        return new ColumnDefinitionParser();
+    }
+
     protected function getType(string $dbType, array $info = []): string
     {
         $dbType = strtolower($dbType);

src/Command.php

@@ -5,7 +5,7 @@
 namespace Yiisoft\Db\Oracle;
 
 use PDO;
-use Yiisoft\Db\Command\DataType;
+use Yiisoft\Db\Constant\DataType;
 use Yiisoft\Db\Constant\PhpType;
 use Yiisoft\Db\Driver\Pdo\AbstractPdoCommand;
 use Yiisoft\Db\QueryBuilder\AbstractQueryBuilder;

tests/ColumnDefinitionParserTest.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Oracle\Tests;
+
+use Yiisoft\Db\Oracle\Column\ColumnDefinitionParser;
+use Yiisoft\Db\Tests\AbstractColumnDefinitionParserTest;
+
+/**
+ * @group oracle
+ */
+final class ColumnDefinitionParserTest extends AbstractColumnDefinitionParserTest
+{
+    protected function createColumnDefinitionParser(): ColumnDefinitionParser
+    {
+        return new ColumnDefinitionParser();
+    }
+
+    /**
+     * @dataProvider \Yiisoft\Db\Oracle\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\Oracle\Tests\Provider;
+
+class ColumnDefinitionParserProvider extends \Yiisoft\Db\Tests\Provider\ColumnDefinitionParserProvider
+{
+    public static function parse(): array
+    {
+        return [
+            ...parent::parse(),
+            ['interval day to second', ['type' => 'interval day to second']],
+            ['interval day to second (2)', ['type' => 'interval day to second', 'size' => 2]],
+            ['interval day(0) to second(2)', ['type' => 'interval day(0) to second', 'size' => 2]],
+            ['timestamp with time zone', ['type' => 'timestamp with time zone']],
+            ['timestamp (3) with time zone', ['type' => 'timestamp (3) with time zone', 'size' => 3]],
+            ['timestamp(3) with local time zone', ['type' => 'timestamp(3) with local time zone', 'size' => 3]],
+            ['interval year to month', ['type' => 'interval year to month']],
+        ];
+    }
+}