Simplify where-ing in withAttributes

laravel · Nov 30, 2024 · 6ff8474 · 6ff8474
1 parent f8874ed
commit 6ff8474
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php b/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php
@@ -535,11 +535,7 @@ public function withAttributes(array|string|Expression $attributes, $value = nul
         }
 
         foreach ($attributes as $column => $value) {
-            if (is_null($value)) {
-                $this->whereNull($column);
-            } else {
-                $this->where($column, $value);
-            }
+            $this->where($column, $value);
         }
 
         $this->pendingAttributes = array_merge($this->pendingAttributes, $attributes);

diff --git a/tests/Database/DatabaseEloquentHasOneOrManyWithAttributesTest.php b/tests/Database/DatabaseEloquentHasOneOrManyWithAttributesTest.php
@@ -203,6 +203,30 @@ public function testWheresAreSet(): void
         ], $wheres);
     }
 
+    public function testNullValueIsAccepted(): void
+    {
+        $parentId = 123;
+        $key = 'a key';
+
+        $parent = new RelatedWithAttributesModel;
+        $parent->id = $parentId;
+
+        $relationship = $parent
+            ->hasMany(RelatedWithAttributesModel::class, 'parent_id')
+            ->withAttributes([$key => null]);
+
+        $wheres = $relationship->toBase()->wheres;
+        $relatedModel = $relationship->make();
+
+        $this->assertNull($relatedModel->$key);
+
+        $this->assertContains([
+            'type' => 'Null',
+            'column' => $key,
+            'boolean' => 'and',
+        ], $wheres);
+    }
+
     public function testOneKeepsAttributesFromHasMany(): void
     {
         $parentId = 123;