svn commit: r887485 - in /ibatis/java/ibatis-3/trunk/ibatis-3-core/src: main/java/org/apache/ibatis/type/ test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/

[cb...@apache.org]

Author: cbegin
Date: Sat Dec  5 02:47:28 2009
New Revision: 887485

URL: http://svn.apache.org/viewvc?rev=887485&view=rev
Log:
IBATIS-686 - Enum type handler is not used when enum is inside a map. Fixed.

Added:
    ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/
    ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/CreateDB.sql
    ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/EnumTypeHandlerTest.java
    ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/Person.java
    ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/Person.xml
    ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/PersonMapper.java
    ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/ibatisConfig.xml
Modified:
    ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java

Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java?rev=887485&r1=887484&r2=887485&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java Sat Dec  5 02:47:28 2009
@@ -58,8 +58,8 @@
     register(byte[].class, JdbcType.BLOB, new BlobTypeHandler());
     register(byte[].class, JdbcType.LONGVARBINARY, new BlobTypeHandler());
 
-    register(Object.class, new ObjectTypeHandler());
-    register(Object.class, JdbcType.OTHER, new ObjectTypeHandler());
+    register(Object.class, UNKNOWN_TYPE_HANDLER);
+    register(Object.class, JdbcType.OTHER, UNKNOWN_TYPE_HANDLER);
 
     register(Date.class, new DateTypeHandler());
     register(Date.class, JdbcType.DATE, new DateOnlyTypeHandler());

Added: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/CreateDB.sql
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/CreateDB.sql?rev=887485&view=auto
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/CreateDB.sql (added)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/CreateDB.sql Sat Dec  5 02:47:28 2009
@@ -0,0 +1,9 @@
+create table person (
+  id int,
+  firstName varchar(100),
+  lastName varchar(100),
+  personType varchar(100) DEFAULT NULL
+);
+
+INSERT INTO person (id, firstName, lastName, personType)
+VALUES (1, 'John', 'Smith', 'PERSON');

Added: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/EnumTypeHandlerTest.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/EnumTypeHandlerTest.java?rev=887485&view=auto
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/EnumTypeHandlerTest.java (added)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/EnumTypeHandlerTest.java Sat Dec  5 02:47:28 2009
@@ -0,0 +1,75 @@
+package org.apache.ibatis.submitted.enumtypehandler_on_map;
+
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.util.List;
+
+import org.apache.ibatis.io.Resources;
+import org.apache.ibatis.jdbc.ScriptRunner;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.session.SqlSessionFactoryBuilder;
+import org.apache.ibatis.submitted.enumtypehandler_on_map.Person.Type;
+import org.apache.ibatis.submitted.enumtypehandler_on_map.PersonMapper.TypeName;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class EnumTypeHandlerTest {
+    
+    private static SqlSessionFactory sqlSessionFactory;
+    
+    @BeforeClass
+    public static void initDatabase() throws Exception {
+        Connection conn = null;
+
+        try {
+            Class.forName("org.hsqldb.jdbcDriver");
+            conn = DriverManager.getConnection("jdbc:hsqldb:mem:enumtypehandler_on_map", "sa",
+                    "");
+
+            Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/enumtypehandler_on_map/CreateDB.sql");
+
+            ScriptRunner runner = new ScriptRunner(conn);
+            runner.setLogWriter(null);
+            runner.setErrorLogWriter(new PrintWriter(System.err));
+            runner.runScript(reader);
+            conn.commit();
+            reader.close();
+
+            reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/enumtypehandler_on_map/ibatisConfig.xml");
+            sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
+            reader.close();
+        } finally {
+            if (conn != null) {
+                conn.close();
+            }
+        }
+    }
+    
+    @Test
+    public void testEnumWithParam() {
+        SqlSession sqlSession = sqlSessionFactory.openSession();
+        PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
+        List<Person> persons = personMapper.getByType(Person.Type.PERSON, "");
+        Assert.assertNotNull("Persons must not be null", persons);
+        Assert.assertEquals("Persons must contain exactly 1 person", 1, persons.size());
+    }
+    @Test
+    public void testEnumWithoutParam() {
+        SqlSession sqlSession = sqlSessionFactory.openSession();
+        PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
+        List<Person> persons = personMapper.getByTypeNoParam(new TypeName() {
+            public String getName() {
+                return "";
+            }
+            public Type getType() {
+                return Person.Type.PERSON;
+            }
+        });
+        Assert.assertNotNull("Persons must not be null", persons);
+        Assert.assertEquals("Persons must contain exactly 1 person", 1, persons.size());
+    }
+}

Added: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/Person.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/Person.java?rev=887485&view=auto
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/Person.java (added)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/Person.java Sat Dec  5 02:47:28 2009
@@ -0,0 +1,31 @@
+package org.apache.ibatis.submitted.enumtypehandler_on_map;
+
+public class Person {
+    
+    public enum Type {
+        PERSON,
+        EMPLOYEE
+    }
+    
+    private Long id;
+    private String firstName;
+    private String lastName;
+    public String getFirstName() {
+        return firstName;
+    }
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+    public String getLastName() {
+        return lastName;
+    }
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+    public Long getId() {
+        return id;
+    }
+    public void setId(Long id) {
+        this.id = id;
+    }
+}

Added: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/Person.xml
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/Person.xml?rev=887485&view=auto
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/Person.xml (added)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/Person.xml Sat Dec  5 02:47:28 2009
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE mapper
+    PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
+    "http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd">
+
+<mapper namespace="org.apache.ibatis.submitted.enumtypehandler_on_map.PersonMapper">
+    
+    <resultMap id="personMap" type="Person">
+        <id property="id" column="Person_id"/>
+        <result property="firstName" column="Person_firstName"/>
+        <result property="lastName" column="Person_lastName"/>
+    </resultMap>
+    
+    
+    <sql id="columns">
+        Person.id AS Person_id,
+        Person.firstName AS Person_firstName,
+        Person.lastName AS Person_lastName,
+        Person.personType AS Person_personType
+    </sql>
+    
+    
+    <select id="getByType" resultMap="personMap" parameterType="map">
+        SELECT <include refid="columns"/>
+        FROM Person
+        WHERE personType = #{type,jdbcType=VARCHAR}
+    </select>
+    <select id="getByTypeNoParam" resultMap="personMap" parameterType="org.apache.ibatis.submitted.enumtypehandler_on_map.PersonMapper$TypeName">
+        SELECT <include refid="columns"/>
+        FROM Person
+        WHERE personType = #{type,jdbcType=VARCHAR}
+    </select>
+    
+</mapper>

Added: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/PersonMapper.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/PersonMapper.java?rev=887485&view=auto
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/PersonMapper.java (added)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/PersonMapper.java Sat Dec  5 02:47:28 2009
@@ -0,0 +1,17 @@
+package org.apache.ibatis.submitted.enumtypehandler_on_map;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface PersonMapper {
+    
+    public static interface TypeName {
+        public Person.Type getType();
+        public String getName();
+    }
+    
+    public List<Person> getByType(@Param("type") Person.Type type, @Param("name") String name);
+    public List<Person> getByTypeNoParam(TypeName typeName);
+    
+}

Added: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/ibatisConfig.xml
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/ibatisConfig.xml?rev=887485&view=auto
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/ibatisConfig.xml (added)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_map/ibatisConfig.xml Sat Dec  5 02:47:28 2009
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE configuration
+    PUBLIC "-//ibatis.apache.org//DTD Config 3.0//EN"
+    "http://ibatis.apache.org/dtd/ibatis-3-config.dtd">
+
+<configuration>
+    <typeAliases>
+        <typeAlias alias="Person" type="org.apache.ibatis.submitted.enumtypehandler_on_map.Person"/>
+    </typeAliases>
+    
+    <environments default="test">
+        <environment id="test">
+            <transactionManager type="JDBC"></transactionManager>
+            <dataSource type="UNPOOLED">
+                <property name="driver" value="org.hsqldb.jdbcDriver"/>
+                <property name="url" value="jdbc:hsqldb:mem:enumtypehandler_on_map"/>
+                <property name="username" value="sa"/>
+            </dataSource>
+        </environment>
+    </environments>
+    
+    <mappers>
+        <mapper resource="org/apache/ibatis/submitted/enumtypehandler_on_map/Person.xml"/>
+    </mappers>
+</configuration>