Created
June 16, 2010 15:00
-
-
Save jwage/440814 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php | |
index 23466a1..0498cc0 100644 | |
--- a/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php | |
+++ b/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php | |
@@ -266,19 +266,19 @@ class XmlExporter extends AbstractExporter | |
} | |
$cascade = array(); | |
if ($associationMapping->isCascadeRemove) { | |
- $cascade[] = 'remove'; | |
+ $cascade[] = 'cascade-remove'; | |
} | |
if ($associationMapping->isCascadePersist) { | |
- $cascade[] = 'persist'; | |
+ $cascade[] = 'cascade-persist'; | |
} | |
if ($associationMapping->isCascadeRefresh) { | |
- $cascade[] = 'refresh'; | |
+ $cascade[] = 'cascade-refresh'; | |
} | |
if ($associationMapping->isCascadeMerge) { | |
- $cascade[] = 'merge'; | |
+ $cascade[] = 'cascade-merge'; | |
} | |
if ($associationMapping->isCascadeDetach) { | |
- $cascade[] = 'detach'; | |
+ $cascade[] = 'cascade-detach'; | |
} | |
if ($cascade) { | |
$cascadeXml = $associationMappingXml->addChild('cascade'); | |
diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php | |
index f1ba8ba..9a6a2b9 100644 | |
--- a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php | |
+++ b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php | |
@@ -290,6 +290,20 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest | |
return $class; | |
} | |
+ /** | |
+ * @depends testLifecycleCallbacksAreExported | |
+ * @param ClassMetadataInfo $class | |
+ */ | |
+ public function testCascadeIsExported($class) | |
+ { | |
+ $this->assertTrue($class->associationMappings['phonenumbers']->isCascadePersist); | |
+ $this->assertFalse($class->associationMappings['phonenumbers']->isCascadeMerge); | |
+ $this->assertFalse($class->associationMappings['phonenumbers']->isCascadeRemove); | |
+ $this->assertFalse($class->associationMappings['phonenumbers']->isCascadeRefresh); | |
+ | |
+ return $class; | |
+ } | |
+ | |
public function __destruct() | |
{ | |
$type = $this->_getType(); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment