RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-20 22:23:14 +03:00
Code Issues Projects Releases Wiki Activity

Fixed type checking on to-many relations

Browse Source
This commit is contained in:
Asmir Mustafic 2015-01-29 00:43:32 +01:00 committed by Marco Pivetta
parent 2e890362c5
commit 5838115582
3 changed files with 29 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
View File

@ -1809,7 +1809,6 @@ class BasicEntityPersister implements EntityPersister
$types = array_merge($types, $this->getTypes($field, $value, $this->class));
$params = array_merge($params, $this->getValues($value));
}
return array($params, $types);
}
@ -1838,7 +1837,6 @@ class BasicEntityPersister implements EntityPersister
$types = array_merge($types, $this->getTypes($criterion['field'], $criterion['value'], $criterion['class']));
$params = array_merge($params, $this->getValues($criterion['value']));
}
return array($params, $types);
}
@ -1855,27 +1853,32 @@ class BasicEntityPersister implements EntityPersister
private function getTypes($field, $value, ClassMetadata $class)
{
$types = array();
switch (true) {
case (isset($this->class->fieldMappings[$field])):
$types[] = $this->class->fieldMappings[$field]['type'];
case (isset($class->fieldMappings[$field])):
$types = array_merge($types, PersisterHelper::getTypeOfField($field, $class, $this->em));
break;
case (isset($class->associationMappings[$field])):
$assoc = $class->associationMappings[$field];
case (isset($this->class->associationMappings[$field])):
$assoc = $this->class->associationMappings[$field];
$class = $this->em->getClassMetadata($assoc['targetEntity']);
if (!$assoc['isOwningSide']) {
$assoc = $class->associationMappings[$assoc['mappedBy']];
$class = $this->em->getClassMetadata($assoc['targetEntity']);
}
$targetPersister = $this->em->getUnitOfWork()->getEntityPersister($assoc['targetEntity']);
if ($assoc['type'] === ClassMetadata::MANY_TO_MANY) {
if(!$assoc['isOwningSide']){
$class = $this->em->getClassMetadata($assoc['targetEntity']);
$assoc = $class->associationMappings[$assoc['mappedBy']];
foreach ($assoc['relationToSourceKeyColumns'] as $field => $val){
$types = array_merge($types, PersisterHelper::getTypeOfField($val, $class, $this->em));
}
$parameters = $targetPersister->expandParameters($assoc['relationToSourceKeyColumns']);
} else {
$parameters = $targetPersister->expandParameters($assoc['isOwningSide']?$assoc['targetToSourceKeyColumns']:$assoc['sourceToTargetKeyColumns']);
foreach ($assoc['targetToSourceKeyColumns'] as $field => $val){
$types = array_merge($types, PersisterHelper::getTypeOfField($field, $class, $this->em));
}
}
$types = array_merge($types, $parameters[1]);
break;
default:
@ -1889,7 +1892,6 @@ class BasicEntityPersister implements EntityPersister
return $type + Connection::ARRAY_PARAM_OFFSET;
}, $types);
}
return $types;
}
@ -1927,29 +1929,6 @@ class BasicEntityPersister implements EntityPersister
return array($this->getIndividualValue($value));
}
/**
* Infers field type to be used by parameter type casting.
*
* @param string $fieldName
* @param mixed $value
* @param ClassMetadata $class
*
* @return integer
*
* @throws \Doctrine\ORM\Query\QueryException
*/
private function getType($fieldName, $value, ClassMetadata $class)
{
$type = PersisterHelper::getTypeOfField($fieldName, $class, $this->em);
if (is_array($value)) {
$type = Type::getType($type)->getBindingType();
$type += Connection::ARRAY_PARAM_OFFSET;
}
return $type;
}
/**
* Retrieves an individual parameter value.
*

6
lib/Doctrine/ORM/Utility/IdentifierFlattener.php
View File

@ -71,8 +71,10 @@ final class IdentifierFlattener
{
$flatId = array();
foreach ($class->identifier as $field) {
if (isset($class->associationMappings[$field]) && isset($id[$field]) && is_object($id[$field])) {
foreach ($class->identifier as $field) {
if (isset($class->associationMappings[$field]) && isset($id[$field]) && $id[$field] instanceof \Doctrine\ORM\Cache\AssociationCacheEntry) {
$flatId[$field] = implode(' ', $id[$field]->identifier);
} elseif (isset($class->associationMappings[$field]) && isset($id[$field]) && is_object($id[$field])) {
$targetClassMetadata = $this->metadataFactory->getMetadataFor(
$class->associationMappings[$field]['targetEntity']
);

20
lib/Doctrine/ORM/Utility/PersisterHelper.php
View File

@ -40,18 +40,18 @@ class PersisterHelper
* @param ClassMetadata $class
* @param EntityManagerInterface $em
*
* @return string|null
* @return array
*
* @throws QueryException
*/
public static function getTypeOfField($fieldName, ClassMetadata $class, EntityManagerInterface $em)
{
if (isset($class->fieldMappings[$fieldName])) {
return $class->fieldMappings[$fieldName]['type'];
return array($class->fieldMappings[$fieldName]['type']);
}
if ( ! isset($class->associationMappings[$fieldName])) {
return null;
return array();
}
$assoc = $class->associationMappings[$fieldName];
@ -60,20 +60,18 @@ class PersisterHelper
return self::getTypeOfField($assoc['mappedBy'], $em->getClassMetadata($assoc['targetEntity']), $em);
}
if (($assoc['type'] & ClassMetadata::MANY_TO_MANY) > 0) {
if ($assoc['type'] & ClassMetadata::MANY_TO_MANY) {
$joinData = $assoc['joinTable'];
} else {
$joinData = $assoc;
}
if (count($joinData['joinColumns']) > 1) {
throw QueryException::associationPathCompositeKeyNotSupported();
$types = array();
$targetClass = $em->getClassMetadata($assoc['targetEntity']);
foreach ($joinData['joinColumns'] as $joinColumn) {
$types[] = self::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $em);
}
$targetColumnName = $joinData['joinColumns'][0]['referencedColumnName'];
$targetClass = $em->getClassMetadata($assoc['targetEntity']);
return self::getTypeOfColumn($targetColumnName, $targetClass, $em);
return $types;
}
/**