Add some minimal support for ARRAY types. Still need a custom type handler for now.

Author: jeffgbutler

src/main/java/org/apache/ibatis/type/JdbcType.java

@@ -4,7 +4,11 @@
 import java.util.*;
 
 public enum JdbcType {
-
+  /**
+   * This is added to enable basic support for the
+   * ARRAY data type - but a custom type handler is still required
+   */
+  ARRAY(Types.ARRAY),
   BIT(Types.BIT),
   TINYINT(Types.TINYINT),
   SMALLINT(Types.SMALLINT),

src/test/java/org/apache/ibatis/submitted/sptests/ArrayTypeHandler.java

@@ -0,0 +1,34 @@
+package org.apache.ibatis.submitted.sptests;
+
+import java.sql.Array;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.TypeHandler;
+
+public class ArrayTypeHandler implements TypeHandler {
+
+    public ArrayTypeHandler() {
+        super();
+    }
+
+    public void setParameter(PreparedStatement ps, int i, Object parameter,
+            JdbcType jdbcType) throws SQLException {
+        ps.setArray(i, (Array) parameter);
+    }
+
+    public Object getResult(ResultSet rs, String columnName)
+            throws SQLException {
+        Array array = rs.getArray(columnName);
+        return array.getArray();
+    }
+
+    public Object getResult(CallableStatement cs, int columnIndex)
+            throws SQLException {
+        Array array = cs.getArray(columnIndex);
+        return array.getArray();
+    }
+}

src/test/java/org/apache/ibatis/submitted/sptests/CreateDB.sql

@@ -1,27 +1,49 @@
-drop procedure sptest.getnames if exists]
-drop procedure sptest.getname if exists]
-drop procedure sptest.adder if exists]
-drop table sptest.names if exists]
-drop schema sptest if exists]
+drop procedure sptest.getnames if exists
+go
 
-create schema sptest]
+drop procedure sptest.getname if exists
+go
+
+drop procedure sptest.adder if exists
+go
+
+drop procedure sptest.arraytest if exists
+go
+
+drop table sptest.names if exists
+go
+
+drop schema sptest if exists
+go
+
+create schema sptest
+go
 
 create procedure sptest.adder(in addend1 integer, in addend2 integer, out theSum integer)
 begin atomic
   set theSum = addend1 + addend2; 
-end]
+end
+go
 
 create table sptest.names (
   id integer generated by default as identity not null,
   first_name varchar(20),
   last_name varchar(20),
   primary key(id)
-)]
+)
+go
+
+insert into sptest.names (first_name, last_name) values('Fred', 'Flintstone')
+go
+
+insert into sptest.names (first_name, last_name) values('Wilma', 'Flintstone')
+go
 
-insert into sptest.names (first_name, last_name) values('Fred', 'Flintstone')]
-insert into sptest.names (first_name, last_name) values('Wilma', 'Flintstone')]
-insert into sptest.names (first_name, last_name) values('Barney', 'Rubble')]
-insert into sptest.names (first_name, last_name) values('Betty', 'Rubble')]
+insert into sptest.names (first_name, last_name) values('Barney', 'Rubble')
+go
+
+insert into sptest.names (first_name, last_name) values('Betty', 'Rubble')
+go
 
 -- note that these create procedure statements will fail until hsqldb 2.0.1
 create procedure sptest.getname(in nameId integer)
@@ -30,7 +52,8 @@ dynamic result sets 1
 BEGIN ATOMIC
   declare cur cursor for select * from sptest.names where id = nameId;
   open cur;
-END]
+END
+go
 
 create procedure sptest.getnames(in lowestId int, out totalrows integer)
 reads sql data
@@ -39,4 +62,16 @@ BEGIN ATOMIC
   declare cur cursor for select * from sptest.names where id >= lowestId;
   select count(*) into totalrows from sptest.names where id >= lowestId;
   open cur;
-END]
+END
+go
+
+create procedure sptest.arraytest(in ids int array, out rowsrequested integer, out returnedids int array)
+reads sql data
+dynamic result sets 1
+begin atomic
+  declare cur cursor for select * from sptest.names where id in (unnest(ids));
+  set rowsrequested = cardinality(ids);
+  set returnedids = array [7, 8, 9, 10];
+  open cur;
+end
+go

src/test/java/org/apache/ibatis/submitted/sptests/SPMapper.java

@@ -8,4 +8,5 @@ public interface SPMapper {
     void adder2(Parameter parameter);
     Name getName(Integer id);
     List<Name> getNames(Map<String, Object> parms);
+    List<Name> getNamesWithArray(Map<String, Object> parms);
 }

src/test/java/org/apache/ibatis/submitted/sptests/SPMapper.xml

@@ -49,4 +49,12 @@
       #{lowestId,jdbcType=INTEGER,mode=IN},
       #{totalRows,jdbcType=INTEGER,mode=OUT})}
   </select>
+
+  <select id="getNamesWithArray" parameterType="java.util.Map" statementType="CALLABLE"
+    resultMap="nameResult">
+    {call sptest.arraytest(
+      #{ids,mode=IN,jdbcType=ARRAY,typeHandler=org.apache.ibatis.submitted.sptests.ArrayTypeHandler},
+      #{requestedRows,jdbcType=INTEGER,mode=OUT},
+      #{returnedIds,mode=OUT,jdbcType=ARRAY,typeHandler=org.apache.ibatis.submitted.sptests.ArrayTypeHandler})}
+  </select>
 </mapper>

src/test/java/org/apache/ibatis/submitted/sptests/SPTest.java

@@ -4,8 +4,10 @@
 import static junit.framework.Assert.assertNotNull;
 
 import java.io.Reader;
+import java.sql.Array;
 import java.sql.Connection;
 import java.sql.DriverManager;
+import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -34,7 +36,7 @@ public static void initDatabase() throws Exception {
             Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/sptests/CreateDB.sql");
 
             ScriptRunner runner = new ScriptRunner(conn);
-            runner.setDelimiter("]");
+            runner.setDelimiter("go");
             runner.setLogWriter(null);
             runner.setErrorLogWriter(null);
             runner.runScript(reader);
@@ -288,4 +290,26 @@ public void testCallWithResultSet4() {
             sqlSession.close();
         }
     }
+
+    @Test
+    @Ignore("until hsqldb 2.0.1 is released")
+    public void testGetNamesWithArray() throws SQLException {
+        SqlSession sqlSession = sqlSessionFactory.openSession();
+        try {
+            SPMapper spMapper = sqlSession.getMapper(SPMapper.class);
+            
+            Array array = sqlSession.getConnection().createArrayOf("int",
+                    new Integer[] {1, 2, 5});
+            
+            Map<String, Object> parms = new HashMap<String, Object>();
+            parms.put("ids", array);
+            List<Name> names = spMapper.getNamesWithArray(parms);
+            Object[] returnedIds = (Object[])parms.get("returnedIds");
+            assertEquals(4, returnedIds.length);
+            assertEquals(3, parms.get("requestedRows"));
+            assertEquals(2, names.size());
+        } finally {
+            sqlSession.close();
+        }
+    }
 }