Improve

yiisoft · Oct 7, 2024 · 3bc2831 · 3bc2831
1 parent c8910c6
commit 3bc2831
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/src/Schema/Column/AbstractColumnFactory.php b/src/Schema/Column/AbstractColumnFactory.php
@@ -163,6 +163,8 @@ protected function isType(string $type): bool
             ColumnType::TIMESTAMP,
             ColumnType::DATE,
             ColumnType::TIME,
+            ColumnType::ARRAY,
+            ColumnType::STRUCTURED,
             ColumnType::JSON => true,
             default => false,
         };

diff --git a/src/Schema/Column/ColumnSchemaInterface.php b/src/Schema/Column/ColumnSchemaInterface.php
@@ -15,10 +15,13 @@
  * @psalm-type ColumnInfo = array{
  *     auto_increment?: bool|string,
  *     check?: string|null,
+ *     column?: ColumnSchemaInterface|null,
+ *     columns?: array<string, ColumnSchemaInterface>,
  *     comment?: string|null,
  *     computed?: bool|string,
  *     db_type?: string|null,
  *     default_value?: mixed,
+ *     dimension?: int|string,
  *     enum_values?: array|null,
  *     extra?: string|null,
  *     primary_key?: bool|string,

diff --git a/tests/AbstractColumnFactoryTest.php b/tests/AbstractColumnFactoryTest.php
@@ -24,6 +24,8 @@ public function testFromDbType(string $dbType, string $expectedType, string $exp
         $this->assertInstanceOf($expectedInstanceOf, $column);
         $this->assertSame($expectedType, $column->getType());
         $this->assertSame($dbType, $column->getDbType());
+
+        $db->close();
     }
 
     /**
@@ -51,6 +53,8 @@ public function testFromDefinition(
         foreach ($columnMethodResults as $method => $result) {
             $this->assertSame($result, $column->$method());
         }
+
+        $db->close();
     }
 
     /** @dataProvider \Yiisoft\Db\Tests\Provider\ColumnFactoryProvider::pseudoTypes */
@@ -76,6 +80,8 @@ public function testFromPseudoType(
         foreach ($columnMethodResults as $method => $result) {
             $this->assertEquals($result, $column->$method());
         }
+
+        $db->close();
     }
 
     /** @dataProvider \Yiisoft\Db\Tests\Provider\ColumnFactoryProvider::types */
@@ -88,6 +94,8 @@ public function testFromType(string $type, string $expectedType, string $expecte
 
         $this->assertInstanceOf($expectedInstanceOf, $column);
         $this->assertSame($expectedType, $column->getType());
+
+        $db->close();
     }
 
     public function testFromDefinitionWithExtra(): void
@@ -101,5 +109,7 @@ public function testFromDefinitionWithExtra(): void
         $this->assertSame('char', $column->getType());
         $this->assertSame(1, $column->getSize());
         $this->assertSame('NOT NULL UNIQUE', $column->getExtra());
+
+        $db->close();
     }
 }
diff --git a/tests/Provider/ColumnFactoryProvider.php b/tests/Provider/ColumnFactoryProvider.php
@@ -13,6 +13,7 @@
 use Yiisoft\Db\Schema\Column\IntegerColumnSchema;
 use Yiisoft\Db\Schema\Column\JsonColumnSchema;
 use Yiisoft\Db\Schema\Column\StringColumnSchema;
+use Yiisoft\Db\Schema\Column\StructuredColumnSchema;
 
 class ColumnFactoryProvider
 {
@@ -64,6 +65,7 @@ public static function types(): array
             'timestamp' => [ColumnType::TIMESTAMP, ColumnType::TIMESTAMP, StringColumnSchema::class],
             'time' => [ColumnType::TIME, ColumnType::TIME, StringColumnSchema::class],
             'date' => [ColumnType::DATE, ColumnType::DATE, StringColumnSchema::class],
+            'structured' => [ColumnType::STRUCTURED, ColumnType::STRUCTURED, StructuredColumnSchema::class],
             'json' => [ColumnType::JSON, ColumnType::JSON, JsonColumnSchema::class],
         ];
     }