fix HasOneJoin current table primary key

fico7489 · Feb 23, 2018 · a56dadb · a56dadb
1 parent 22c5cb7
commit a56dadb
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Traits/EloquentJoinTrait.php b/src/Traits/EloquentJoinTrait.php
@@ -90,8 +90,9 @@ private function performJoin($builder, $relations)
         $baseTable = $this->getTable();
         $baseModel = $this;
 
-        $currentTable = $this->getTable();
         $currentModel = $this;
+        $currentPrimaryKey = $this->getKeyName();
+        $currentTable = $this->getTable();
 
         foreach ($relations as $relation) {
             if ($relation == $column) {
@@ -124,8 +125,8 @@ private function performJoin($builder, $relations)
                     $keyRelated = $relatedRelation->getForeignKey();
                     $keyRelated = last(explode('.', $keyRelated));
 
-                    $builder->leftJoin($joinQuery, function ($join) use ($relatedTableAlias, $keyRelated, $currentTable, $relatedPrimaryKey, $relatedModel) {
-                        $join->on($relatedTableAlias . '.' . $keyRelated, '=', $currentTable . '.' . $relatedPrimaryKey);
+                    $builder->leftJoin($joinQuery, function ($join) use ($relatedTableAlias, $keyRelated, $currentTable, $relatedPrimaryKey, $relatedModel, $currentPrimaryKey) {
+                        $join->on($relatedTableAlias . '.' . $keyRelated, '=', $currentTable . '.' . $currentPrimaryKey);
 
                         $this->leftJoinQuery($join, $relatedModel, $relatedTableAlias);
                     });
@@ -134,8 +135,9 @@ private function performJoin($builder, $relations)
                 }
             }
 
-            $currentTable = $relatedTableAlias;
             $currentModel = $relatedModel;
+            $currentPrimaryKey = $relatedPrimaryKey;
+            $currentTable = $relatedTableAlias;
 
             $this->joinedTables[$relation] = $relatedTableAlias;
         }