New property relations eager loading fix (#48)

jaredk2g · Sep 10, 2021 · b84cfd0 · b84cfd0
1 parent 4ba83be
commit b84cfd0
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Hydrator.php b/src/Hydrator.php
@@ -54,9 +54,10 @@ public static function hydrate(array $result, $modelClass, array $eagerLoaded):
 
                 foreach ($ids[$k] as $j => $id) {
                     if (isset($relationships[$id])) {
-                        $models[$j]->setRelation($k, $relationships[$id]);
+                        if ($property->isPersisted()) {
+                            $models[$j]->setRelation($k, $relationships[$id]);
                         // older style properties do not support this type of hydration
-                        if (!$property->isPersisted()) {
+                        } else {
                             $models[$j]->hydrateValue($k, $relationships[$id]);
                         }
                     }
@@ -66,9 +67,10 @@ public static function hydrate(array $result, $modelClass, array $eagerLoaded):
 
                 foreach ($ids[$k] as $j => $id) {
                     if (isset($relationships[$id])) {
-                        $models[$j]->setRelation($k, $relationships[$id]);
+                        if ($property->isPersisted()) {
+                            $models[$j]->setRelation($k, $relationships[$id]);
                         // older style properties do not support this type of hydration
-                        if (!$property->isPersisted()) {
+                        } else {
                             $models[$j]->hydrateValue($k, $relationships[$id]);
                         }
                     } else {