RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #458 from barelon/master

Browse source 
Use cascade=all if all cascade options set
This commit is contained in:
Benjamin Eberlei 2012-10-05 09:45:44 -07:00
commit 0c8be37ca9
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Doctrine/ORM/Tools/EntityGenerator.php
View file

@ -1045,6 +1045,10 @@ public function __construct()
if ($associationMapping['isCascadeMerge']) $cascades[] = '"merge"'; if ($associationMapping['isCascadeMerge']) $cascades[] = '"merge"';
if ($associationMapping['isCascadeRefresh']) $cascades[] = '"refresh"'; if ($associationMapping['isCascadeRefresh']) $cascades[] = '"refresh"';
if (count($cascades) === 5) {
$cascades = array('"all"');
}
$typeOptions[] = 'cascade={' . implode(',', $cascades) . '}'; $typeOptions[] = 'cascade={' . implode(',', $cascades) . '}';
} }

5
lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php
View file

@ -99,6 +99,11 @@ class PhpExporter extends AbstractExporter
unset($cascade[$key]); unset($cascade[$key]);
} }
} }
if (count($cascade) === 5) {
$cascade = array('all');
}
$associationMappingArray = array( $associationMappingArray = array(
'fieldName' => $associationMapping['fieldName'], 'fieldName' => $associationMapping['fieldName'],
'targetEntity' => $associationMapping['targetEntity'], 'targetEntity' => $associationMapping['targetEntity'],