|
@@ -742,7 +742,7 @@ discard block |
|
|
block discarded – undo |
|
742
|
742
|
private function getIndentifierValue($entity, $id) |
|
743
|
743
|
{ |
|
744
|
744
|
if ($entity instanceof AssociationCacheEntry) { |
|
745
|
|
- return $entity->identifier[$id]; |
|
|
745
|
+ return $entity->identifier[$id]; |
|
746
|
746
|
} |
|
747
|
747
|
|
|
748
|
748
|
return $this->reflFields[$id]->getValue($entity); |
|
@@ -1438,7 +1438,7 @@ discard block |
|
|
block discarded – undo |
|
1438
|
1438
|
|
|
1439
|
1439
|
if (Type::hasType($mapping['type']) && Type::getType($mapping['type'])->canRequireSQLConversion()) { |
|
1440
|
1440
|
if (isset($mapping['id']) && true === $mapping['id']) { |
|
1441
|
|
- throw MappingException::sqlConversionNotAllowedForIdentifiers($this->name, $mapping['fieldName'], $mapping['type']); |
|
|
1441
|
+ throw MappingException::sqlConversionNotAllowedForIdentifiers($this->name, $mapping['fieldName'], $mapping['type']); |
|
1442
|
1442
|
} |
|
1443
|
1443
|
|
|
1444
|
1444
|
$mapping['requireSQLConversion'] = true; |
Please login to merge, or discard this patch.