Author: jgbutler
Date: Thu Nov 30 12:37:32 2006
New Revision: 481067
URL: http://svn.apache.org/viewvc?view=rev&rev=481067
Log:
Fixes for IBATIS-374: Allow <resultMap> with no <result> (<resultMap> must
extend another <resultMap>)
Modified:
ibatis/trunk/java/mapper/mapper2/build/version.properties
ibatis/trunk/java/mapper/mapper2/doc/release.txt
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/sql-map-2.dtd
Modified: ibatis/trunk/java/mapper/mapper2/build/version.properties
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/build/version.properties?view=diff&rev=481067&r1=481066&r2=481067
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/build/version.properties (original)
+++ ibatis/trunk/java/mapper/mapper2/build/version.properties Thu Nov 30
12:37:32 2006
@@ -1,5 +1,5 @@
#Build version info
-#Wed Nov 29 15:19:21 CST 2006
+#Thu Nov 30 14:34:38 CST 2006
version=2.3.0
-buildDate=2006/11/29 15\:19
-buildNum=675
+buildDate=2006/11/30 14\:34
+buildNum=676
Modified: ibatis/trunk/java/mapper/mapper2/doc/release.txt
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/doc/release.txt?view=diff&rev=481067&r1=481066&r2=481067
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/doc/release.txt (original)
+++ ibatis/trunk/java/mapper/mapper2/doc/release.txt Thu Nov 30 12:37:32 2006
@@ -17,6 +17,7 @@
o Fixed IBATIS-366 - Use ResultObjectFactory to create nested classes
o Fixed IBATIS-367 - Inner class type handler is not handled correctly within
maps
o Fixed IBATIS-373 - Allow iBATIS to build SqlMapClient from InputStream
+ o Fixed IBATIS-374 - Allow <resultMap> with no <result> - must extend another
<resultMap>
------------------------------
Modified:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java?view=diff&rev=481067&r1=481066&r2=481067
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java
Thu Nov 30 12:37:32 2006
@@ -324,11 +324,16 @@
private void addResultMapNodelets() {
parser.addNodelet("/sqlMap/resultMap/end()", new Nodelet() {
public void process(Node node) throws Exception {
+
+ if (vars.resultMappingList.size() == 0) {
+ throw new RuntimeException("resultMap " +
vars.currentResultMap.getId() + " must have at least one result mapping");
+ }
+
vars.currentResultMap.setResultMappingList(vars.resultMappingList);
vars.currentResultMap.setDiscriminator(vars.discriminator);
vars.discriminator = null;
-
+
vars.client.getDelegate().addResultMap(vars.currentResultMap);
vars.errorCtx.setMoreInfo(null);
Modified:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/sql-map-2.dtd
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/sql-map-2.dtd?view=diff&rev=481067&r1=481066&r2=481067
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/sql-map-2.dtd
(original)
+++
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/sql-map-2.dtd
Thu Nov 30 12:37:32 2006
@@ -39,7 +39,7 @@
resultMap CDATA #IMPLIED
numericScale CDATA #IMPLIED
>
-<!ELEMENT resultMap (result+, discriminator?)>
+<!ELEMENT resultMap (result*, discriminator?)>
<!ATTLIST resultMap
id CDATA #REQUIRED
class CDATA #REQUIRED
