Merge pull request #39 from bakaphp/fix-relationship-search

bakaphp · Apr 28, 2020 · abf52b2 · abf52b2
2 parents 4469c4a + a07fb15
commit abf52b2
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Converter/RequestUriToSql.php b/src/Converter/RequestUriToSql.php
@@ -229,9 +229,13 @@ protected function prepareCustomSearch($hasSubquery = false): array
                 $modelObject = new $model();
                 $model = $modelObject->getSource();
 
-                $relatedKey = $metaData->getPrimaryKeyAttributes($modelObject)[0];
+                $relationKey = $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;
+
+                if (isset($relation) && count($relation)) {
+                    $relatedKey = $relation[0]->getReferencedFields();
+                    $relationKey = $relation[0]->getFields();
+                }
 
                 $sql .= " INNER JOIN {$model} ON {$model}.{$relatedKey} = (";
                 $sql .= "SELECT {$model}.{$relatedKey} FROM {$model} WHERE {$model}.{$relatedKey} = {$classname}.{$relationKey}";