Author: gbayon
Date: Sat Jan 20 03:57:00 2007
New Revision: 498106
URL: http://svn.apache.org/viewvc?view=rev&rev=498106
Log:
Fixed IBATISNET-204 : DataMapper SqlMap.xsd SqlMap elements order
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/ChangeLog.txt
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/SqlMap.xsd
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/ChangeLog.txt
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/ChangeLog.txt?view=diff&rev=498106&r1=498105&r2=498106
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/ChangeLog.txt (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/ChangeLog.txt Sat Jan 20
03:57:00 2007
@@ -4,6 +4,7 @@
1.6.0 - BETA
------------------------------
Issues
+- IBATISNET-204 : DataMapper SqlMap.xsd SqlMap elements order
- IBATISNET-202 : QueryForDictionary does not process select property
- IBATISNET-198 : Cache key for accessors can be ambiguous and can cause cast
exceptions
- IBATISNET-193 : Implement N+1 Select resolution with groupBy attribute
Modified: ibatis/trunk/cs/mapper/IBatisNet.DataMapper/SqlMap.xsd
URL:
http://svn.apache.org/viewvc/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/SqlMap.xsd?view=diff&rev=498106&r1=498105&r2=498106
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper/SqlMap.xsd (original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper/SqlMap.xsd Sat Jan 20 03:57:00
2007
@@ -659,7 +659,7 @@
<xs:element name="resultMaps">
<xs:complexType>
<xs:sequence>
- <xs:element ref="resultMap"
maxOccurs="unbounded"/>
+ <xs:element ref="resultMap" minOccurs="0"
maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -723,13 +723,13 @@
</xs:element>
<xs:element name="sqlMap">
<xs:complexType>
- <xs:sequence>
+ <xs:all>
<xs:element ref="alias" minOccurs="0"/>
<xs:element ref="cacheModels" minOccurs="0"/>
<xs:element ref="resultMaps" minOccurs="0"/>
<xs:element ref="statements" minOccurs="0" />
<xs:element ref="parameterMaps" minOccurs="0"/>
- </xs:sequence>
+ </xs:all>
<xs:attribute name="namespace" type="xs:string"
use="required"/>
</xs:complexType>
</xs:element>
