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

Nullable relations, fixing join condition

Browse Source
This commit is contained in:
Asmir Mustafic 2011-10-21 15:30:21 +02:00
parent fe84a61d0b
commit d4059b88ca
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Doctrine/ORM/Tools/EntityGenerator.php
View File

@ -634,7 +634,7 @@ public function <methodName>()
foreach ($metadata->associationMappings as $associationMapping) { foreach ($metadata->associationMappings as $associationMapping) {
if ($associationMapping['type'] & ClassMetadataInfo::TO_ONE) { if ($associationMapping['type'] & ClassMetadataInfo::TO_ONE) {
$nullable = $this->_associationIsNullable($associationMapping); $nullable = $this->_isAssociationIsNullable($associationMapping);
if ($code = $this->_generateEntityStubMethod($metadata, 'set', $associationMapping['fieldName'], $associationMapping['targetEntity'], ($nullable?'null':null))) { if ($code = $this->_generateEntityStubMethod($metadata, 'set', $associationMapping['fieldName'], $associationMapping['targetEntity'], ($nullable?'null':null))) {
$methods[] = $code; $methods[] = $code;
} }
@ -654,7 +654,7 @@ public function <methodName>()
return implode("\n\n", $methods); return implode("\n\n", $methods);
} }
private function _associationIsNullable($associationMapping) private function _isAssociationIsNullable($associationMapping)
{ {
if(isset($associationMapping['joinColumns'])){ if(isset($associationMapping['joinColumns'])){
$joinColumns = $associationMapping['joinColumns']; $joinColumns = $associationMapping['joinColumns'];
@ -665,7 +665,7 @@ public function <methodName>()
$joinColumns = array(); $joinColumns = array();
} }
foreach ($joinColumns as $joinColumn) { foreach ($joinColumns as $joinColumn) {
if(!isset($joinColumn['nullable']) || !$joinColumn['nullable']){ if(isset($joinColumn['nullable']) && !$joinColumn['nullable']){
return false; return false;
} }
} }