RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-03 05:49:25 +03:00
Code Issues Projects Releases Wiki Activity

Apply additional fixes to the SqlWalker to fix tests

Browse Source
This commit is contained in:
Alessandro Lai 2017-06-21 10:11:31 +02:00 committed by Sergio Santoro
parent 5181eae8d6
commit 167dfde00f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Doctrine/ORM/Query/SqlWalker.php
View File

@ -2290,7 +2290,7 @@ class SqlWalker implements TreeWalker
$metadata = $this->em->getClassMetadata($parameter); $metadata = $this->em->getClassMetadata($parameter);
if ($metadata->getReflectionClass()->isSubclassOf($discrClass->name)) { if (! $metadata->getReflectionClass()->isSubclassOf($discrClass->name)) {
throw QueryException::instanceOfUnrelatedClass($parameter, $discrClass->name); throw QueryException::instanceOfUnrelatedClass($parameter, $discrClass->name);
} }
@ -2302,13 +2302,15 @@ class SqlWalker implements TreeWalker
$currentMetadata = $this->em->getClassMetadata($class); $currentMetadata = $this->em->getClassMetadata($class);
$currentDiscriminator = $currentMetadata->discriminatorValue; $currentDiscriminator = $currentMetadata->discriminatorValue;
if (null !== $currentDiscriminator && ! array_key_exists($currentDiscriminator, $discriminators)) { if (null !== $currentDiscriminator) {
$discriminators[$currentDiscriminator] = null; $discriminators[$currentDiscriminator] = null;
} }
} }
} }
$sqlParameterList = array_map([$this->conn, 'quote'], array_keys($discriminators)); foreach (array_keys($discriminators) as $dis) {
$sqlParameterList[] = $this->conn->quote($dis);
}
return '(' . implode(', ', $sqlParameterList) . ')'; return '(' . implode(', ', $sqlParameterList) . ')';
} }