Merge pull request #2818 from yajra/patch1

[10.x] Fix HasOneThrough
yajra · Jul 12, 2022 · 36287cd · 36287cd
2 parents 22e6dcf + 3a861cd
commit 36287cd
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/src/EloquentDataTable.php b/src/EloquentDataTable.php
@@ -196,16 +196,18 @@ protected function joinEagerLoadedColumn($relation, $relationColumn)
 
                 case $model instanceof HasOneThrough:
                     $pivot = explode('.', $model->getQualifiedParentKeyName())[0]; // extract pivot table from key
-                    $pivotPK = $pivot.'.'.$model->getLocalKeyName();
+                    $pivotPK = $pivot.'.'.$model->getFirstKeyName();
                     $pivotFK = $model->getQualifiedLocalKeyName();
                     $this->performJoin($pivot, $pivotPK, $pivotFK);
 
                     $related = $model->getRelated();
                     $table = $related->getTable();
-                    $tablePK = $related->getForeignKey();
+                    $tablePK = $model->getSecondLocalKeyName();
                     $foreign = $pivot.'.'.$tablePK;
                     $other = $related->getQualifiedKeyName();
 
+                    $lastQuery->addSelect($lastQuery->getModel()->getTable().'.*');
+
                     break;
 
                 case $model instanceof HasOneOrMany:

diff --git a/tests/Integration/HasOneThroughTest.php b/tests/Integration/HasOneThroughTest.php
@@ -26,6 +26,31 @@ public function it_returns_all_records_with_the_relation_when_called_without_par
         $this->assertCount(60, $response->json()['data']);
     }
 
+    /** @test */
+    public function it_can_search_has_one_through_relation()
+    {
+        $response = $this->call('GET', '/relations/hasOneThroughSearchRelation', [
+            'columns' => [
+                [
+                    'data'       => 'heart.size',
+                    'searchable' => true,
+                    'search'     => [
+                        'value' => 'heart-1',
+                    ],
+                ],
+            ],
+        ]);
+
+        $response->assertJson([
+            'draw'            => 0,
+            'recordsTotal'    => 60,
+            'recordsFiltered' => 33,
+        ]);
+
+        $this->assertArrayHasKey('heart', $response->json()['data'][0]);
+        $this->assertCount(33, $response->json()['data']);
+    }
+
     /** @test */
     public function it_returns_all_records_with_the_deleted_relation_when_called_with_withtrashed_parameter()
     {
@@ -101,6 +126,10 @@ protected function setUp(): void
             return $datatables->eloquent(Post::with('heart')->select('posts.*'))->toJson();
         });
 
+        $this->app['router']->get('/relations/hasOneThroughSearchRelation', function (DataTables $datatables) {
+            return $datatables->eloquent(Post::with('heart'))->addColumns(['hearts.size'])->toJson();
+        });
+
         $this->app['router']->get('/relations/hasOneThroughWithTrashed', function (DataTables $datatables) {
             return $datatables->eloquent(Post::with(['heart' => function ($query) {
                 $query->withTrashed();