Upgrade MyBatis build to use HSQLDB 2.0.0

Author: jeffgbutler

pom.xml

@@ -215,9 +215,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>hsqldb</groupId>
+      <groupId>org.hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      <version>1.8.0.1</version>
+      <version>2.0.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/test/java/com/ddl/hsql/jpetstore-hsqldb-schema.sql

@@ -55,8 +55,8 @@ create table profile (
     userid varchar(80) not null,
     langpref varchar(80) not null,
     favcategory varchar(30),
-    mylistopt int,
-    banneropt int,
+    mylistopt boolean,
+    banneropt boolean,
     constraint pk_profile primary key (userid)
 );
 

src/test/java/com/ibatis/sqlmap/maps/RepeatingGroupMapping.xml

@@ -96,8 +96,10 @@
   <select id="getAllProductCategoriesJIRA250" resultMap="categoryResultJIRA250">
     select
     c.catid, c.name as catname, c.descn as catdescn,
-    null as productid, null as category, null as prodname,
-    null as proddescn
+    cast(null as varchar(1)) as productid,
+    cast(null as varchar(1)) as category,
+    cast(null as varchar(1)) as prodname,
+    cast(null as varchar(1)) as proddescn
     from category c
   </select>
 

src/test/java/com/ibatis/sqlmap/maps/SqlMapConfig.properties

@@ -1,5 +1,11 @@
 driver=org.hsqldb.jdbcDriver
-url=jdbc:hsqldb:.
+
+# HSQLDB2 requires that the get_column_name property be set false
+# for the returned column name to be the same as the label.  This
+# is required for MyBatis tests where columns are renamed in a
+# select statement (select fred AS betty ...)
+url=jdbc:hsqldb:mem:somename;get_column_name=false
+
 username=sa
 password=
 

src/test/java/com/scripts/order-init.sql

@@ -23,13 +23,13 @@ CREATE TABLE ORDERS (
 
 -- Creating Test Data
 
-INSERT INTO ORDERS VALUES (1, 1, '2003-02-15 8:15:00', 'VISA', '999999999999', '05/03', '11 This Street', 'Victoria', 'BC', 'C4B 4F4',2);
-INSERT INTO ORDERS VALUES (2, 4, '2003-02-15 8:15:00', 'MC', '888888888888', '06/03', '222 That Street', 'Edmonton', 'AB', 'X4K 5Y4',1);
-INSERT INTO ORDERS VALUES (3, 3, '2003-02-15 8:15:00', 'AMEX', '777777777777', '07/03', '333 Other Street', 'Regina', 'SK', 'Z4U 6Y4',2);
-INSERT INTO ORDERS VALUES (4, 2, '2003-02-15 8:15:00', 'MC', '666666666666', '08/03', '444 His Street', 'Toronto', 'ON', 'K4U 3S4',1);
-INSERT INTO ORDERS VALUES (5, 5, '2003-02-15 8:15:00', 'VISA', '555555555555', '09/03', '555 Her Street', 'Calgary', 'AB', 'J4J 7S4',2);
-INSERT INTO ORDERS VALUES (6, 5, '2003-02-15 8:15:00', 'VISA', '999999999999', '10/03', '6 Their Street', 'Victoria', 'BC', 'T4H 9G4',1);
-INSERT INTO ORDERS VALUES (7, 4, '2003-02-15 8:15:00', 'MC', '888888888888', '11/03', '77 Lucky Street', 'Edmonton', 'AB', 'R4A 0Z4',2);
-INSERT INTO ORDERS VALUES (8, 3, '2003-02-15 8:15:00', 'AMEX', '777777777777', '12/03', '888 Our Street', 'Regina', 'SK', 'S4S 7G4',1);
-INSERT INTO ORDERS VALUES (9, 2, '2003-02-15 8:15:00', 'MC', '666666666666', '01/04', '999 Your Street', 'Toronto', 'ON', 'G4D 9F4',2);
-INSERT INTO ORDERS VALUES (10, 1, '2003-02-15 8:15:00', 'VISA', '555555555555', '02/04', '99 Some Street', 'Calgary', 'AB', 'W4G 7A4',1);
+INSERT INTO ORDERS VALUES (1, 1, '2003-02-15 08:15:00', 'VISA', '999999999999', '05/03', '11 This Street', 'Victoria', 'BC', 'C4B 4F4',2);
+INSERT INTO ORDERS VALUES (2, 4, '2003-02-15 08:15:00', 'MC', '888888888888', '06/03', '222 That Street', 'Edmonton', 'AB', 'X4K 5Y4',1);
+INSERT INTO ORDERS VALUES (3, 3, '2003-02-15 08:15:00', 'AMEX', '777777777777', '07/03', '333 Other Street', 'Regina', 'SK', 'Z4U 6Y4',2);
+INSERT INTO ORDERS VALUES (4, 2, '2003-02-15 08:15:00', 'MC', '666666666666', '08/03', '444 His Street', 'Toronto', 'ON', 'K4U 3S4',1);
+INSERT INTO ORDERS VALUES (5, 5, '2003-02-15 08:15:00', 'VISA', '555555555555', '09/03', '555 Her Street', 'Calgary', 'AB', 'J4J 7S4',2);
+INSERT INTO ORDERS VALUES (6, 5, '2003-02-15 08:15:00', 'VISA', '999999999999', '10/03', '6 Their Street', 'Victoria', 'BC', 'T4H 9G4',1);
+INSERT INTO ORDERS VALUES (7, 4, '2003-02-15 08:15:00', 'MC', '888888888888', '11/03', '77 Lucky Street', 'Edmonton', 'AB', 'R4A 0Z4',2);
+INSERT INTO ORDERS VALUES (8, 3, '2003-02-15 08:15:00', 'AMEX', '777777777777', '12/03', '888 Our Street', 'Regina', 'SK', 'S4S 7G4',1);
+INSERT INTO ORDERS VALUES (9, 2, '2003-02-15 08:15:00', 'MC', '666666666666', '01/04', '999 Your Street', 'Toronto', 'ON', 'G4D 9F4',2);
+INSERT INTO ORDERS VALUES (10, 1, '2003-02-15 08:15:00', 'VISA', '555555555555', '02/04', '99 Some Street', 'Calgary', 'AB', 'W4G 7A4',1);

src/test/java/org/apache/ibatis/binding/BindingTest.java

@@ -127,7 +127,7 @@ public void shouldExecuteBoundSelectMapOfBlogsById() {
       Map<Integer,Blog> blogs = mapper.selectBlogsAsMapById();
       assertEquals(2, blogs.size());
       for(Map.Entry<Integer,Blog> blogEntry : blogs.entrySet()) {
-        assertEquals(blogEntry.getKey(), blogEntry.getValue().getId());
+        assertEquals(blogEntry.getKey(), (Integer) blogEntry.getValue().getId());
       }
     } finally {
       session.close();

src/test/java/org/apache/ibatis/session/SqlSessionTest.java

@@ -104,7 +104,7 @@ public void shouldSelectAllAuthorsAsMap() throws Exception {
       final Map<Integer,Author> authors = session.selectMap("domain.blog.mappers.AuthorMapper.selectAllAuthors", "id");
       assertEquals(2, authors.size());
       for(Map.Entry<Integer,Author> authorEntry : authors.entrySet()) {
-        assertEquals(authorEntry.getKey(), authorEntry.getValue().getId());
+        assertEquals(authorEntry.getKey(), (Integer) authorEntry.getValue().getId());
       }
     } finally {
       session.close();

src/test/java/org/apache/ibatis/submitted/complex_property/db/User.xml

@@ -7,22 +7,22 @@
 <mapper namespace="User">
 
   <resultMap type="UserAlias" id="UserResult">
-    <id column="id" jdbcType="BIGINT" property="id"/>
+    <id column="id" jdbcType="INTEGER" property="id"/>
     <result column="username" jdbcType="VARCHAR" property="username"/>
     <result column="password" jdbcType="VARCHAR" property="password.encrypted"/>
-    <result column="administrator" jdbcType="BIT" property="administrator"/>
+    <result column="administrator" jdbcType="BOOLEAN" property="administrator"/>
   </resultMap>
 
   <select id="find" parameterType="long" resultMap="UserResult">
-    SELECT * FROM user WHERE id = #{id:BIGINT}
+    SELECT * FROM user WHERE id = #{id:INTEGER}
   </select>
 
   <select id="version" parameterType="long" resultType="int">
-    SELECT version FROM user WHERE id = #{id,jdbcType=BIGINT}
+    SELECT version FROM user WHERE id = #{id,jdbcType=INTEGER}
   </select>
 
   <delete id="delete" parameterType="UserAlias">
-    DELETE FROM user WHERE id = #{id:BIGINT}
+    DELETE FROM user WHERE id = #{id:INTEGER}
   </delete>
 
   <insert id="insert" parameterType="UserAlias" useGeneratedKeys="false">
@@ -36,17 +36,17 @@
     ( #{id},
     #{username,jdbcType=VARCHAR},
     #{password.encrypted:VARCHAR},
-    #{administrator,jdbcType=BIT}
+    #{administrator,jdbcType=BOOLEAN}
     )
   </insert>
 
   <update id="update" parameterType="UserAlias">
     UPDATE user SET
     username = #{username,jdbcType=VARCHAR},
     password = #{password.encrypted,jdbcType=VARCHAR},
-    administrator = #{administrator,jdbcType=BIT}
+    administrator = #{administrator,jdbcType=BOOLEAN}
     WHERE
-    id = #{id,jdbcType=BIGINT}
+    id = #{id,jdbcType=INTEGER}
   </update>
 
   <!--   Unique constraint check -->

src/test/java/org/apache/ibatis/submitted/complex_property/db/db.sql

@@ -2,6 +2,6 @@ create table user (
 id int,
 username varchar(32) not null,
 password varchar(128) not null,
-administrator int,
+administrator boolean,
 primary key (id)
 );