From 7905f2a972ef93f3fc5a528136198a8fb38908d2 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 3 Apr 2011 23:03:39 +0200 Subject: [PATCH] [DDC-1040] Bugfix with named parameters and multiple entities passed as parameter. --- lib/Doctrine/ORM/Query.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Query.php b/lib/Doctrine/ORM/Query.php index d428e2ddb..fa7fff2e4 100644 --- a/lib/Doctrine/ORM/Query.php +++ b/lib/Doctrine/ORM/Query.php @@ -249,7 +249,12 @@ final class Query extends AbstractQuery $idValues = $class->getIdentifierValues($value); } $sqlPositions = $paramMappings[$key]; - $sqlParams += array_combine((array)$sqlPositions, $idValues); + $cSqlPos = count($sqlPositions); + $cIdValues = count($idValues); + $idValues = array_values($idValues); + for ($i = 0; $i < $cSqlPos; $i++) { + $sqlParams[$sqlPositions[$i]] = $idValues[ ($i % $cIdValues) ]; + } } else { foreach ($paramMappings[$key] as $position) { $sqlParams[$position] = $value;