check for real primary key

laravel · Aug 2, 2017 · 8d82618 · 8d82618
1 parent cfa39f7
commit 8d82618
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Relations/Pivot.php b/src/Illuminate/Database/Eloquent/Relations/Pivot.php
@@ -95,6 +95,10 @@ public static function fromRawAttributes(Model $parent, $attributes, $table, $ex
      */
     protected function setKeysForSaveQuery(Builder $query)
     {
+        if (isset($this->attributes[$this->getKeyName()])) {
+            return parent::setKeysForSaveQuery($query);
+        }
+
         $query->where($this->foreignKey, $this->getAttribute($this->foreignKey));
 
         return $query->where($this->relatedKey, $this->getAttribute($this->relatedKey));
@@ -107,6 +111,10 @@ protected function setKeysForSaveQuery(Builder $query)
      */
     public function delete()
     {
+        if (isset($this->attributes[$this->getKeyName()])) {
+            return parent::delete();
+        }
+
         return $this->getDeleteQuery()->delete();
     }