Fix fresh and refresh on pivots and morph pivots (#34836)

laravel · Oct 14, 2020 · 9510cca · 9510cca
1 parent ece8810
commit 9510cca
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
@@ -1206,9 +1206,8 @@ public function fresh($with = [])
             return;
         }
 
-        return static::newQueryWithoutScopes()
+        return $this->setKeysForSaveQuery(static::newQueryWithoutScopes())
                         ->with(is_string($with) ? func_get_args() : $with)
-                        ->where($this->getKeyName(), $this->getKey())
                         ->first();
     }
 
@@ -1224,7 +1223,7 @@ public function refresh()
         }
 
         $this->setRawAttributes(
-            static::newQueryWithoutScopes()->findOrFail($this->getKey())->attributes
+            $this->setKeysForSaveQuery(static::newQueryWithoutScopes())->firstOrFail()->attributes
         );
 
         $this->load(collect($this->relations)->reject(function ($relation) {