svn commit: r725607 - in /ibatis/trunk/java/ibatis-3/ibatis-3-core/src: main/java/org/apache/ibatis/parser/ test/java/org/apache/ibatis/api/ test/java/org/apache/ibatis/parser/

[cbegin]

Author: cbegin
Date: Wed Dec 10 23:31:06 2008
New Revision: 725607

URL: http://svn.apache.org/viewvc?rev=725607&view=rev
Log:
fixed parameter/result confusion in mapperparser, and added selectOne test.

Modified:
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperParser.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/ibatis-mapper-3.dtd
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/SqlSessionTest.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/AuthorMapper.xml

Modified: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperParser.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperParser.java?rev=725607&r1=725606&r2=725607&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperParser.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperParser.java
 Wed Dec 10 23:31:06 2008
@@ -414,7 +414,7 @@
     Integer numericScale = context.getIntAttribute("numericScale",null);
 
     ParameterMode modeEnum = resolveParameterMode(mode);
-    Class resultType = resultMapBuilder.type();
+    Class resultType = parameterMapBuilder.type();
     Class javaTypeClass = resolveParameterJavaType(resultType, property, 
javaType);
     JdbcType jdbcTypeEnum = resolveJdbcType(jdbcType);
     TypeHandler typeHandlerInstance = (TypeHandler) 
resolveInstance(typeHandler);

Modified: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/ibatis-mapper-3.dtd
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/ibatis-mapper-3.dtd?rev=725607&r1=725606&r2=725607&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/ibatis-mapper-3.dtd
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/ibatis-mapper-3.dtd
 Wed Dec 10 23:31:06 2008
@@ -20,7 +20,7 @@
 readOnly CDATA #REQUIRED
 >
 
-<!ELEMENT parameterMap (parameter+)>
+<!ELEMENT parameterMap (parameter+)?>
 <!ATTLIST parameterMap
 id CDATA #REQUIRED
 type CDATA #REQUIRED

Modified: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/SqlSessionTest.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/SqlSessionTest.java?rev=725607&r1=725606&r2=725607&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/SqlSessionTest.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/SqlSessionTest.java
 Wed Dec 10 23:31:06 2008
@@ -22,12 +22,23 @@
   }
 
   @Test
-  public void shouldBuildBlogMappers() throws Exception {
+  public void shouldSelectAllAuthors() throws Exception {
     SqlSession session = sqlMapper.openSession();
     try {
       List<Author> authors = 
session.selectList("com.domain.AuthorMapper.selectAllAuthors");
       Assert.assertEquals(2,authors.size());
+    } finally {
+      session.close();
+    }
+  }
 
+  @Test
+  public void shouldSelectOneAuthor() throws Exception {
+    SqlSession session = sqlMapper.openSession();
+    try {
+      Author author = (Author) session.selectOne(
+          "com.domain.AuthorMapper.selectAuthor", new Author(101));
+      Assert.assertEquals(101, author.getId());
     } finally {
       session.close();
     }

Modified: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/AuthorMapper.xml
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/AuthorMapper.xml?rev=725607&r1=725606&r2=725607&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/AuthorMapper.xml
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/AuthorMapper.xml
 Wed Dec 10 23:31:06 2008
@@ -9,5 +9,13 @@
   <select id="selectAllAuthors" resultType="domain.blog.Author">
     select * from author
   </select>
- 
+
+  <parameterMap id="selectAuthor" type="domain.blog.Author">
+    <parameter property="id" />
+  </parameterMap>
+
+  <select id="selectAuthor" parameterMap="selectAuthor" 
resultType="domain.blog.Author">
+    select * from author where id = ?
+  </select>
+
 </mapper>
\ No newline at end of file