From eff87be568a1d67ec08a31ea2d634b43913959db Mon Sep 17 00:00:00 2001
From: romanb <romanb@625475ce-881a-0410-a577-b389adb331d8>
Date: Sat, 19 Dec 2009 14:06:22 +0000
Subject: [PATCH] [2.0][DDC-207] Fixed. Also added fetch-type.

---
 doctrine-mapping.xsd | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/doctrine-mapping.xsd b/doctrine-mapping.xsd
index 04438e018..bda7e5713 100644
--- a/doctrine-mapping.xsd
+++ b/doctrine-mapping.xsd
@@ -105,6 +105,13 @@
       <xs:enumeration value="RESTRICT"/> 
       <xs:enumeration value="SET_NULL"/>
     </xs:restriction> 
+  </xs:simpleType>
+  
+  <xs:simpleType name="fetch-type"> 
+    <xs:restriction base="xs:token"> 
+      <xs:enumeration value="EAGER"/> 
+      <xs:enumeration value="LAZY"/>
+    </xs:restriction> 
   </xs:simpleType> 
 
   <xs:complexType name="field">
@@ -207,6 +214,7 @@
     </xs:sequence>
     <xs:attribute name="target-entity" type="xs:NMTOKEN" use="required" />
     <xs:attribute name="field" type="xs:NMTOKEN" use="required" />
+    <xs:attribute name="fetch" type="orm:fetch-type" default="LAZY" />
   </xs:complexType>
 
   <xs:complexType name="one-to-many">
@@ -217,6 +225,21 @@
     <xs:attribute name="mapped-by" type="xs:NMTOKEN" />
     <xs:attribute name="field" type="xs:NMTOKEN" use="required" />
     <xs:attribute name="orphan-removal" type="xs:boolean" default="false" />
+    <xs:attribute name="fetch" type="orm:fetch-type" default="LAZY" />
+  </xs:complexType>
+  
+  <xs:complexType name="many-to-one">
+    <xs:sequence>
+      <xs:element name="cascade" type="orm:cascade-type" minOccurs="0" />
+      <xs:choice minOccurs="0" maxOccurs="1">
+        <xs:element name="join-column" type="orm:join-column"/>
+        <xs:element name="join-columns" type="orm:join-columns"/>
+      </xs:choice>
+    </xs:sequence>
+    <xs:attribute name="target-entity" type="xs:NMTOKEN" use="required" />
+    <xs:attribute name="field" type="xs:NMTOKEN" use="required" />
+    <xs:attribute name="orphan-removal" type="xs:boolean" default="false" />
+    <xs:attribute name="fetch" type="orm:fetch-type" default="LAZY" />
   </xs:complexType>
   
   <xs:complexType name="one-to-one">
@@ -231,6 +254,7 @@
     <xs:attribute name="mapped-by" type="xs:NMTOKEN" />
     <xs:attribute name="field" type="xs:NMTOKEN" use="required" />
     <xs:attribute name="orphan-removal" type="xs:boolean" default="false" />
+    <xs:attribute name="fetch" type="orm:fetch-type" default="LAZY" />
   </xs:complexType>
 
 </xs:schema>
\ No newline at end of file