Merge pull request #74 from designmynight/fix-save-after-index

fix: perform ES queries on cloned model
designmynight · Jan 10, 2019 · 8ba82cd · 8ba82cd
2 parents 5045e8f + bed526a
commit 8ba82cd
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/Searchable.php b/src/Searchable.php
@@ -37,17 +37,14 @@ public function getSearchType()
      */
     public function onSearchConnection(\Closure $callback)
     {
-        $originalConnection = $this->getConnectionName();
+        $arguments = array_slice(func_get_args(), 1);
 
-        $this->setConnection(static::getElasticsearchConnectionName());
+        $elasticModel = clone $arguments[0];
+        $elasticModel->setConnectionName(static::getElasticsearchConnectionName());
 
-        try {
-            $result = $callback(...array_slice(func_get_args(), 1));
-        } finally {
-            $this->setConnection($originalConnection);
-        }
+        $arguments[0] = $elasticModel;
 
-        return $result;
+        return $callback(...$arguments);
     }
 
     /**