Improve

Author: 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->initStructuredDefaultValue($column);
         }
 
         return $column;
@@ -179,4 +170,25 @@ protected function normalizeNotNullDefaultValue(string $defaultValue, ColumnInte
 
         return $value;
     }
+
+    /**
+     * Initializes the default value for structured columns.
+     */
+    private function initStructuredDefaultValue(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->initStructuredDefaultValue($structuredColumn);
+                    }
+                }
+            }
+        }
+    }
 }

tests/Provider/StructuredTypeProvider.php

@@ -110,7 +110,6 @@ public static function columns(): array
                         dimension: 2,
                         column: new StructuredColumn(
                             dbType: 'currency_money_structured',
-                            defaultValue: null,
                             columns: [
                                 'value' => new DoubleColumn(
                                     ColumnType::DECIMAL,
@@ -143,7 +142,7 @@ public static function columns(): array
                         columns: [
                             'price_from' => new StructuredColumn(
                                 dbType: 'currency_money_structured',
-                                defaultValue: null,
+                                defaultValue: ['value' => 0.0, 'currency_code' => 'USD'],
                                 columns: [
                                     'value' => new DoubleColumn(
                                         ColumnType::DECIMAL,
@@ -152,23 +151,23 @@ public static function columns(): array
                                         notNull: false,
                                         size: 10,
                                         scale: 2,
-                                        defaultValue: null,
+                                        defaultValue: 0.0,
                                     ),
                                     'currency_code' => new StringColumn(
                                         ColumnType::CHAR,
                                         dbType: 'bpchar',
                                         name: 'currency_code',
                                         notNull: false,
                                         size: 3,
-                                        defaultValue: null,
+                                        defaultValue: 'USD',
                                     ),
                                 ],
                                 name: 'price_from',
                                 notNull: false,
                             ),
                             'price_to' => new StructuredColumn(
                                 dbType: 'currency_money_structured',
-                                defaultValue: null,
+                                defaultValue: ['value' => 100.0, 'currency_code' => 'USD'],
                                 columns: [
                                     'value' => new DoubleColumn(
                                         ColumnType::DECIMAL,
@@ -177,15 +176,15 @@ public static function columns(): array
                                         notNull: false,
                                         size: 10,
                                         scale: 2,
-                                        defaultValue: null,
+                                        defaultValue: 100.0,
                                     ),
                                     'currency_code' => new StringColumn(
                                         ColumnType::CHAR,
                                         dbType: 'bpchar',
                                         name: 'currency_code',
                                         notNull: false,
                                         size: 3,
-                                        defaultValue: null,
+                                        defaultValue: 'USD',
                                     ),
                                 ],
                                 name: 'price_to',