From 224dcff9d87af02d3eb00cb05d4a3d860e2ac6e6 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 7 Oct 2021 10:35:01 +0200 Subject: [PATCH] wip --- src/Query.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Query.php b/src/Query.php index b39325e..d473126 100644 --- a/src/Query.php +++ b/src/Query.php @@ -568,11 +568,12 @@ public function createSubQuery(Model $target, $targetPath, Model $from = null) $subQueryConditions = []; foreach ((array) $this->getModel()->getKeyName() as $column) { $fk = $subQueryResolver->qualifyColumn($column, $sourceAlias); + $ck = $from !== null ? $from->getKeyName() : $column; - if (isset($from->$column)) { - $subQueryConditions["$fk = ?"] = $from->$column; + if (isset($from->$ck)) { + $subQueryConditions["$fk = ?"] = $from->$ck; } else { - $subQueryConditions[] = "$fk = " . $resolver->qualifyColumn($column, $baseAlias); + $subQueryConditions[] = "$fk = " . $resolver->qualifyColumn($ck, $baseAlias); } }