[10.x] Stop adding constraints twice on *Many to *One relationships v…

…ia one() (#46575) * create new HasOne from HasMany without constraints * create MorphMany without constraints * create one from HasManyThrough without duplicating constraints * run noConstraint against MorphOne instead of MorphMany
laravel · Mar 25, 2023 · 034d849 · 034d849
1 parent 6011968
commit 034d849
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Relations/HasMany.php b/src/Illuminate/Database/Eloquent/Relations/HasMany.php
@@ -13,7 +13,12 @@ class HasMany extends HasOneOrMany
      */
     public function one()
     {
-        return new HasOne($this->getQuery(), $this->parent, $this->foreignKey, $this->localKey);
+        return HasOne::noConstraints(fn () => new HasOne(
+            $this->getQuery(),
+            $this->parent,
+            $this->foreignKey,
+            $this->localKey
+        ));
     }
 
     /**

diff --git a/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php b/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php
@@ -88,15 +88,15 @@ public function __construct(Builder $query, Model $farParent, Model $throughPare
      */
     public function one()
     {
-        return new HasOneThrough(
+        return HasOneThrough::noConstraints(fn () => new HasOneThrough(
             $this->getQuery(),
             $this->farParent,
             $this->throughParent,
             $this->getFirstKeyName(),
             $this->secondKey,
             $this->getLocalKeyName(),
             $this->getSecondLocalKeyName(),
-        );
+        ));
     }
 
     /**

diff --git a/src/Illuminate/Database/Eloquent/Relations/MorphMany.php b/src/Illuminate/Database/Eloquent/Relations/MorphMany.php
@@ -13,7 +13,13 @@ class MorphMany extends MorphOneOrMany
      */
     public function one()
     {
-        return new MorphOne($this->getQuery(), $this->getParent(), $this->morphType, $this->foreignKey, $this->localKey);
+        return MorphOne::noConstraints(fn () => new MorphOne(
+            $this->getQuery(),
+            $this->getParent(),
+            $this->morphType,
+            $this->foreignKey,
+            $this->localKey
+        ));
     }
 
     /**