Merge pull request #19 from bakaphp/fix/model-relations

set default relationKey to the main resource primaryKey
bakaphp · Apr 11, 2019 · b2f3b04 · b2f3b04
2 parents c4152eb + 2da482d
commit b2f3b04
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/QueryParserCustomFields.php b/src/QueryParserCustomFields.php
@@ -257,10 +257,17 @@ protected function prepareCustomSearch($hasSubquery = false): array
 
                 $relatedKey = $metaData->getPrimaryKeyAttributes($modelObject)[0];
                 $relation = $this->model->getModelsManager()->getRelationsBetween(get_class($this->model), get_class($modelObject));
-                $relationKey = (isset($relation) && count($relation)) ? $relation[0]->getFields() : $relatedKey;
+
+                $relationKey = $primaryKey;
+                $referenceKey = $primaryKey;
+
+                if (isset($relation) && $relation && count($relation)) {
+                    $relationKey =  $relation[0]->getFields();
+                    $referenceKey =  $relation[0]->getReferencedFields();
+                }
 
                 $sql .= " INNER JOIN {$model} ON {$model}.{$relatedKey} = (";
-                $sql .= "SELECT {$model}.{$relatedKey} FROM {$model} WHERE {$model}.{$relatedKey} = {$classname}.{$relationKey}";
+                $sql .= "SELECT {$model}.{$relatedKey} FROM {$model} WHERE {$model}.{$referenceKey} = {$classname}.{$relationKey}";
 
                 foreach ($searchFields as $fKey => $searchFieldValues) {
                     if (is_array(current($searchFieldValues))) {