RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-29 19:41:45 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #308 from FabioBatSilva/DDC-1697

Browse Source 
Fix DDC-1697
This commit is contained in:
Guilherme Blanco 2012-03-24 20:29:52 -07:00
commit 8a52e3033b
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Doctrine/ORM/AbstractQuery.php
View File

@ -229,9 +229,9 @@ abstract class AbstractQuery
{ {
switch (true) { switch (true) {
case is_array($value): case is_array($value):
for ($i = 0, $l = count($value); $i < $l; $i++) { foreach ($value as $key => $paramValue) {
$paramValue = $this->processParameterValue($value[$i]); $paramValue = $this->processParameterValue($paramValue);
$value[$i] = is_array($paramValue) ? $paramValue[key($paramValue)] : $paramValue; $value[$key] = is_array($paramValue) ? $paramValue[key($paramValue)] : $paramValue;
} }
return $value; return $value;

21
tests/Doctrine/Tests/ORM/Query/QueryTest.php
View File

@ -125,4 +125,25 @@ class QueryTest extends \Doctrine\Tests\OrmTestCase
$q = $this->_em->createQuery("SELECT DISTINCT u from Doctrine\Tests\Models\CMS\CmsUser u LEFT JOIN u.articles a"); $q = $this->_em->createQuery("SELECT DISTINCT u from Doctrine\Tests\Models\CMS\CmsUser u LEFT JOIN u.articles a");
$q->iterate(); $q->iterate();
} }
/**
* @group DDC-1697
*/
public function testKeyValueParameters()
{
$cities = array(
0 => "Paris",
3 => "Canne",
9 => "St Julien"
);
$query = $this->_em
->createQuery("SELECT a FROM Doctrine\Tests\Models\CMS\CmsAddress a WHERE a.city IN (:cities)")
->setParameter('cities', $cities);
$parameters = $query->getParameters();
$this->assertArrayHasKey('cities', $parameters);
$this->assertEquals($cities, $parameters['cities']);
}
} }