[11.x] Apply relation constraints on upsert

src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php

@@ -276,6 +276,23 @@ public function updateOrCreate(array $attributes, array $values = [])
         });
     }
 
+    /**
+     * Insert new records or update the existing ones.
+     *
+     * @param  array  $values
+     * @param  array|string  $uniqueBy
+     * @param  array|null  $update
+     * @return int
+     */
+    public function upsert(array $values, $uniqueBy, $update = null)
+    {
+        foreach ($values as $key => $value) {
+            $values[$key][$this->getForeignKeyName()] = $this->getParentKey();
+        }
+
+        return $this->getQuery()->upsert($values, $uniqueBy, $update);
+    }
+
     /**
      * Attach a model instance to the parent model.
      *

src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php

@@ -96,6 +96,23 @@ protected function setForeignAttributesForCreate(Model $model)
         $model->{$this->getMorphType()} = $this->morphClass;
     }
 
+    /**
+     * Insert new records or update the existing ones.
+     *
+     * @param  array  $values
+     * @param  array|string  $uniqueBy
+     * @param  array|null  $update
+     * @return int
+     */
+    public function upsert(array $values, $uniqueBy, $update = null)
+    {
+        foreach ($values as $key => $value) {
+            $values[$key][$this->getMorphType()] = $this->getMorphClass();
+        }
+
+        return parent::upsert($values, $uniqueBy, $update);
+    }
+
     /** @inheritDoc */
     public function getRelationExistenceQuery(Builder $query, Builder $parentQuery, $columns = ['*'])
     {

tests/Database/DatabaseEloquentHasManyTest.php

@@ -253,6 +253,29 @@ public function testUpdateOrCreateMethodCreatesNewModelWithForeignKeySet()
         $this->assertInstanceOf(Model::class, $relation->updateOrCreate(['foo'], ['bar']));
     }
 
+    public function testRelationUpsertFillsForeignKey()
+    {
+        $relation = $this->getRelation();
+
+        $relation->getQuery()->shouldReceive('upsert')->with(
+            [
+                ['email' => 'foo3', 'name' => 'bar', $relation->getForeignKeyName() => $relation->getParentKey()],
+                ['name' => 'bar2', 'email' => 'foo2', $relation->getForeignKeyName() => $relation->getParentKey()],
+            ],
+            ['email'],
+            ['name']
+        );
+
+        $relation->upsert(
+            [
+                ['email' => 'foo3', 'name' => 'bar'],
+                ['name' => 'bar2', 'email' => 'foo2'],
+            ],
+            ['email'],
+            ['name']
+        );
+    }
+
     public function testRelationIsProperlyInitialized()
     {
         $relation = $this->getRelation();

tests/Database/DatabaseEloquentMorphTest.php

@@ -67,6 +67,29 @@ public function testMorphManyEagerConstraintsAreProperlyAdded()
         $relation->addEagerConstraints([$model1, $model2]);
     }
 
+    public function testMorphRelationUpsertFillsForeignKey()
+    {
+        $relation = $this->getManyRelation();
+
+        $relation->getQuery()->shouldReceive('upsert')->with(
+            [
+                ['email' => 'foo3', 'name' => 'bar', $relation->getForeignKeyName() => $relation->getParentKey(), $relation->getMorphType() => $relation->getMorphClass()],
+                ['name' => 'bar2', 'email' => 'foo2', $relation->getForeignKeyName() => $relation->getParentKey(), $relation->getMorphType() => $relation->getMorphClass()],
+            ],
+            ['email'],
+            ['name']
+        );
+
+        $relation->upsert(
+            [
+                ['email' => 'foo3', 'name' => 'bar'],
+                ['name' => 'bar2', 'email' => 'foo2'],
+            ],
+            ['email'],
+            ['name']
+        );
+    }
+
     public function testMakeFunctionOnMorph()
     {
         $_SERVER['__eloquent.saved'] = false;