Refactor test of columns (#399)

Author: Tigrov

CHANGELOG.md

@@ -11,7 +11,7 @@
 - Enh #353: Update `bit` type according to main PR yiisoft/db#860 (@Tigrov) 
 - Enh #354: Refactor PHP type of `ColumnSchemaInterface` instances (@Tigrov)
 - Enh #356: Raise minimum PHP version to `^8.1` with minor refactoring (@Tigrov)
-- New #355, #368, #370: Implement `ColumnFactory` class (@Tigrov)
+- New #355, #368, #370, #399: Implement `ColumnFactory` class (@Tigrov)
 - Enh #359: Separate column type constants (@Tigrov)
 - Enh #359: Remove `Schema::TYPE_ARRAY` and `Schema::TYPE_STRUCTURED` constants (@Tigrov)
 - New #360: Realize `ColumnBuilder` class (@Tigrov)

src/Column/ColumnFactory.php

@@ -124,16 +124,7 @@ public function fromType(string $type, array $info = []): ColumnInterface
         $column = parent::fromType($type, $info);
 
         if ($column instanceof StructuredColumn) {
-            /** @psalm-var array|null $defaultValue */
-            $defaultValue = $column->getDefaultValue();
-
-            if (is_array($defaultValue)) {
-                foreach ($column->getColumns() as $structuredColumnName => $structuredColumn) {
-                    if (isset($defaultValue[$structuredColumnName])) {
-                        $structuredColumn->defaultValue($defaultValue[$structuredColumnName]);
-                    }
-                }
-            }
+            $this->initializeStructuredDefaultValue($column);
         }
 
         return $column;
@@ -179,4 +170,25 @@ protected function normalizeNotNullDefaultValue(string $defaultValue, ColumnInte
 
         return $value;
     }
+
+    /**
+     * Initializes the default value for structured columns.
+     */
+    private function initializeStructuredDefaultValue(StructuredColumn $column): void
+    {
+        /** @psalm-var array|null $defaultValue */
+        $defaultValue = $column->getDefaultValue();
+
+        if (is_array($defaultValue)) {
+            foreach ($column->getColumns() as $structuredColumnName => $structuredColumn) {
+                if (isset($defaultValue[$structuredColumnName])) {
+                    $structuredColumn->defaultValue($defaultValue[$structuredColumnName]);
+
+                    if ($structuredColumn instanceof StructuredColumn) {
+                        $this->initializeStructuredDefaultValue($structuredColumn);
+                    }
+                }
+            }
+        }
+    }
 }

tests/ColumnTest.php

@@ -277,10 +277,11 @@ public function testStructuredType(): void
                         name: 'price_array2',
                         notNull: false,
                         columns: [
-                            'value' => new DoubleColumn(ColumnType::DECIMAL, dbType: 'numeric', name: 'value', notNull: false, scale: 2, size: 10),
-                            'currency_code' => new StringColumn(ColumnType::CHAR, dbType: 'bpchar', name: 'currency_code', notNull: false, size: 3),
+                            'value' => new DoubleColumn(ColumnType::DECIMAL, dbType: 'numeric', name: 'value', notNull: false, scale: 2, size: 10, defaultValue: null),
+                            'currency_code' => new StringColumn(ColumnType::CHAR, dbType: 'bpchar', name: 'currency_code', notNull: false, size: 3, defaultValue: null),
                         ],
                     ),
+                    defaultValue: null,
                 ),
             ),
             $priceArray2->dbTypecast([null, null]),