Merge pull request #28804 from staudenmeir/cursor

[5.8] Set connection name on cursor() results
laravel · Jun 11, 2019 · 1ca32c0 · 1ca32c0
2 parents d328708 + e19637e
commit 1ca32c0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Illuminate/Database/Eloquent/Builder.php b/src/Illuminate/Database/Eloquent/Builder.php
@@ -643,7 +643,7 @@ protected function isNestedUnder($relation, $name)
     public function cursor()
     {
         foreach ($this->applyScopes()->query->cursor() as $record) {
-            yield $this->model->newFromBuilder($record);
+            yield $this->newModelInstance()->newFromBuilder($record);
         }
     }
 

diff --git a/tests/Database/DatabaseEloquentIntegrationTest.php b/tests/Database/DatabaseEloquentIntegrationTest.php
@@ -184,6 +184,7 @@ public function testBasicModelRetrieval()
         $models = EloquentTestUser::where('id', 1)->cursor();
         foreach ($models as $model) {
             $this->assertEquals(1, $model->id);
+            $this->assertEquals('default', $model->getConnectionName());
         }
 
         $records = DB::table('users')->where('id', 1)->cursor();