Merge pull request #294 from domaframework/support-array

Support Array for bind variable directives and literal variable direc…

Author: nakamura-to

src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java

@@ -253,13 +253,15 @@ protected Void visitValueNode(ValueNode node, Context p, Consumer<Scalar<?, ?>>
       openedFragmentNode.accept(this, p);
       if (Iterable.class.isAssignableFrom(valueClass)) {
         handleIterableValueNode(node, p, (Iterable<?>) value, valueClass, valueHandler);
+      } else if (valueClass.isArray()) {
+        handleIterableValueNode(node, p, Arrays.asList((Object[]) value), valueClass, valueHandler);
       } else {
         throw new JdbcException(
             Message.DOMA2112,
             location.getSql(),
             location.getLineNumber(),
             location.getPosition(),
-            node.getText(),
+            node.getVariableName(),
             valueClass);
       }
       OtherNode closedFragmentNode = parensNode.getClosedFragmentNode();

src/main/java/org/seasar/doma/message/Message.java

@@ -115,7 +115,7 @@ public enum Message implements MessageResource {
   DOMA2111(
       "Failed to build the SQL on line [{1}] at column [{2}]. The cause is as follows: {3}. SQL[{0}]"),
   DOMA2112(
-      "Failed to build the SQL on line [{1}] at column [{2}]. The object type[{4}] that corresponds to the bind variable comment or the literal variable comment[{3}] that is just before the parenthesis is not subtype of java.lang.Iterable. SQL[{0}]"),
+      "Failed to build the SQL on line [{1}] at column [{2}]. The type of the variable [{3}] must be a subtype of either java.lang.Iterable or Array, but it is [{4}]. SQL[{0}]"),
   DOMA2115(
       "Failed to build the SQL on line [{1}] at column [{2}]. The [{4}]th element of java.lang.Iterable that corresponds to the bind variable comment or the literal variable comment[{3}] that is just before the parenthesis is null. SQL[{0}]"),
   DOMA2116(

src/test/java/org/seasar/doma/internal/jdbc/sql/SqlParserTest.java

@@ -57,7 +57,7 @@ public void testBindVariable_domain() throws Exception {
     assertEquals("01-2345-6789", sql.getParameters().get(0).getWrapper().get());
   }
 
-  public void testBindVariable_in() throws Exception {
+  public void testBindVariable_in_iterable() throws Exception {
     ExpressionEvaluator evaluator = new ExpressionEvaluator();
     evaluator.add("name", new Value(List.class, Arrays.asList("hoge", "foo")));
     String testSql = "select * from aaa where ename in /*name*/('aaa', 'bbb')";
@@ -74,6 +74,23 @@ public void testBindVariable_in() throws Exception {
     assertEquals("foo", sql.getParameters().get(1).getWrapper().get());
   }
 
+  public void testBindVariable_in_array() throws Exception {
+    ExpressionEvaluator evaluator = new ExpressionEvaluator();
+    evaluator.add("name", new Value(String[].class, new String[] {"hoge", "foo"}));
+    String testSql = "select * from aaa where ename in /*name*/('aaa', 'bbb')";
+    SqlParser parser = new SqlParser(testSql);
+    SqlNode sqlNode = parser.parse();
+    PreparedSql sql =
+        new NodePreparedSqlBuilder(
+                config, SqlKind.SELECT, "dummyPath", evaluator, SqlLogType.FORMATTED)
+            .build(sqlNode, Function.identity());
+    assertEquals("select * from aaa where ename in (?, ?)", sql.getRawSql());
+    assertEquals("select * from aaa where ename in ('hoge', 'foo')", sql.getFormattedSql());
+    assertEquals(2, sql.getParameters().size());
+    assertEquals("hoge", sql.getParameters().get(0).getWrapper().get());
+    assertEquals("foo", sql.getParameters().get(1).getWrapper().get());
+  }
+
   public void testBindVariable_in_empty_iterable() throws Exception {
     ExpressionEvaluator evaluator = new ExpressionEvaluator();
     evaluator.add("name", new Value(List.class, Collections.emptyList()));