wip

Author: brendt

packages/database/src/Mappers/SelectModelMapper.php

@@ -40,51 +40,81 @@ private function normalizeFields(ModelInspector $model, array $rows): array
     {
         $data = [];
 
-        $mainTable = $model->getTableDefinition()->name;
-
-        $hasManyRelations = [];
+//        $hasManyRelations = [];
 
         foreach ($rows as $row) {
-            foreach ($row as $field => $value) {
-                $parts = explode('.', $field);
+            $row = $this->normalizeRow($model, $row);
+
+            foreach ($row as $key => $value) {
+                if (is_array($value)) {
+                    $data[$key] ??= [];
+                    $data[$key] = [...$data[$key], ...$value];
+                } else {
+                    $data[$key] = $value;
+                }
+            }
+        }
 
-                $mainField = $parts[0];
+//        foreach ($hasManyRelations as $name => $hasMany) {
+//            $data[$name] = array_values($data[$name]);
+//        }
 
-                // Main fields
-                if ($mainField === $mainTable) {
-                    $data[$parts[1]] = $value;
-                    continue;
-                }
+        return $data;
+    }
 
-                $relation = $model->getRelation($parts[0]);
+    public function normalizeRow(ModelInspector $model, array $row): array
+    {
+        $mainTable = $model->getTableName();
 
-                // IF count > 2
+        $data = [];
 
-                // BelongsTo
-                if ($relation instanceof BelongsTo || $relation instanceof HasOne) {
-                    $data[$relation->name][$parts[1]] = $value;
-                    continue;
-                }
+        foreach ($row as $field => $value) {
+            $parts = explode('.', $field);
 
-                // HasMany
-                if ($relation instanceof HasMany) {
-                    $hasManyId = $row[$relation->idField()];
+            $mainField = $parts[0];
 
-                    if ($hasManyId === null) {
-                        // Empty has many relations are initialized it with an empty array
-                        $data[$relation->name] ??= [];
-                        continue;
-                    }
+            // Main fields
+            if ($mainField === $mainTable) {
+                $data[$parts[1]] = $value;
+                continue;
+            }
 
-                    $hasManyRelations[$relation->name] ??= $relation;
+            $relation = $model->getRelation($parts[0]);
 
-                    $data[$relation->name][$hasManyId][str_replace($mainField . '.', '', $field)] = $value;
-                }
+            // Nested relations
+            if (count($parts) > 2) {
+                $subRelation = model($relation)->getRelation($parts[1]);
+
+                $data[$relation->name][$subRelation->name] ??= [];
+
+                $data[$relation->name][$subRelation->name] = [
+                    ...$data[$relation->name][$subRelation->name],
+                    ...$this->normalizeRow(model($subRelation), [
+                        implode('.', array_slice($parts, 1)) => $value,
+                    ]),
+                ];
+
+                continue;
             }
-        }
 
-        foreach ($hasManyRelations as $name => $hasMany) {
-            $data[$name] = array_values($data[$name]);
+            // BelongsTo
+            if ($relation instanceof BelongsTo || $relation instanceof HasOne) {
+                $data[$relation->name][$parts[1]] = $value;
+                continue;
+            }
+
+            // HasMany
+            if ($relation instanceof HasMany) {
+                $hasManyId = $row[$relation->idField()];
+
+                if ($hasManyId === null) {
+                    // Empty has many relations are initialized it with an empty array
+                    $data[$relation->name] ??= [];
+                    continue;
+                }
+
+                $data[$relation->name][$hasManyId][$parts[1]] = $value;
+            }
         }
 
         return $data;

tests/Integration/Database/Builder/InsertQueryBuilderTest.php

@@ -79,17 +79,17 @@ public function test_insert_on_model_table(): void
         $query = query(Author::class)
             ->insert(
                 $author,
-                ['name' => 'other name', 'type' => AuthorType::B->value],
+                ['name' => 'other name', 'type' => AuthorType::B->value, 'publisher_id' => null],
             )
             ->build();
 
         $expected = <<<SQL
-        INSERT INTO `authors` (`name`, `type`)
-        VALUES (?, ?), (?, ?)
+        INSERT INTO `authors` (`name`, `type`, `publisher_id`)
+        VALUES (?, ?, ?), (?, ?, ?)
         SQL;
 
         $this->assertSame($expected, $query->toSql());
-        $this->assertSame(['brent', 'a', 'other name', 'b'], $query->bindings);
+        $this->assertSame(['brent', 'a', null, 'other name', 'b', null], $query->bindings);
     }
 
     public function test_insert_on_model_table_with_new_relation(): void

tests/Integration/Database/Builder/SelectQueryBuilderTest.php

@@ -70,7 +70,7 @@ public function test_select_from_model(): void
         $sql = $query->toSql();
 
         $expected = <<<SQL
-        SELECT authors.name AS `authors.name`, authors.type AS `authors.type`, authors.id AS `authors.id`
+        SELECT authors.name AS `authors.name`, authors.type AS `authors.type`, authors.publisher_id AS `authors.publisher_id`, authors.id AS `authors.id`
         FROM `authors`
         SQL;
 
@@ -271,7 +271,7 @@ public function test_select_first_with_non_object_model(): void
             ->whereField('id', 2)
             ->first();
 
-        $this->assertSame(['id' => 2, 'name' => 'Other', 'type' => null], $author);
+        $this->assertSame(['id' => 2, 'name' => 'Other', 'type' => null, 'publisher_id' => null], $author);
     }
 
     public function test_select_all_with_non_object_model(): void
@@ -290,7 +290,7 @@ public function test_select_all_with_non_object_model(): void
             ->all();
 
         $this->assertSame(
-            [['id' => 2, 'name' => 'Other', 'type' => null], ['id' => 3, 'name' => 'Another', 'type' => 'a']],
+            [['id' => 2, 'name' => 'Other', 'type' => null, 'publisher_id' => null], ['id' => 3, 'name' => 'Another', 'type' => 'a', 'publisher_id' => null]],
             $authors,
         );
     }
@@ -313,7 +313,7 @@ public function test_with_belongs_to_relation(): void
             ->build();
 
         $this->assertSame(<<<SQL
-        SELECT books.title AS `books.title`, books.author_id AS `books.author_id`, books.id AS `books.id`, authors.name AS `authors.name`, authors.type AS `authors.type`, authors.id AS `authors.id`, chapters.title AS `chapters.title`, chapters.contents AS `chapters.contents`, chapters.book_id AS `chapters.book_id`, chapters.id AS `chapters.id`, isbns.value AS `isbns.value`, isbns.book_id AS `isbns.book_id`
+        SELECT books.title AS `books.title`, books.author_id AS `books.author_id`, books.id AS `books.id`, authors.name AS `authors.name`, authors.type AS `authors.type`, authors.publisher_id AS `authors.publisher_id`, authors.id AS `authors.id`, chapters.title AS `chapters.title`, chapters.contents AS `chapters.contents`, chapters.book_id AS `chapters.book_id`, chapters.id AS `chapters.id`, isbns.value AS `isbns.value`, isbns.book_id AS `isbns.book_id`
         FROM `books`
         LEFT JOIN authors ON authors.id = books.author_id
         LEFT JOIN chapters ON chapters.book_id = books.id