クエリビルダのgetSql()の呼び出しでエラーが発生しないように修正

fix #113

Author: nakamura-to

src/main/java/org/seasar/doma/jdbc/builder/DeleteBuilder.java

@@ -159,15 +159,20 @@ public int execute() {
         if (query.getMethodName() == null) {
             query.setCallerMethodName("execute");
         }
+        prepare();
+        DeleteCommand command = new DeleteCommand(query);
+        int result = command.execute();
+        query.complete();
+        return result;
+    }
+
+    private void prepare() {
+        query.clearParameters();
         for (Param p : helper.getParams()) {
             query.addParameter(p.name, p.paramClass, p.param);
         }
         query.setSqlNode(helper.getSqlNode());
         query.prepare();
-        DeleteCommand command = new DeleteCommand(query);
-        int result = command.execute();
-        query.complete();
-        return result;
     }
 
     /**
@@ -239,8 +244,7 @@ public Sql<?> getSql() {
         if (query.getMethodName() == null) {
             query.setCallerMethodName("getSql");
         }
-        query.setSqlNode(helper.getSqlNode());
-        query.prepare();
+        prepare();
         return query.getSql();
     }
 

src/main/java/org/seasar/doma/jdbc/builder/InsertBuilder.java

@@ -160,15 +160,20 @@ public int execute() {
         if (query.getMethodName() == null) {
             query.setCallerMethodName("execute");
         }
+        prepare();
+        InsertCommand command = new InsertCommand(query);
+        int result = command.execute();
+        query.complete();
+        return result;
+    }
+
+    private void prepare() {
+        query.clearParameters();
         for (Param p : helper.getParams()) {
             query.addParameter(p.name, p.paramClass, p.param);
         }
         query.setSqlNode(helper.getSqlNode());
         query.prepare();
-        InsertCommand command = new InsertCommand(query);
-        int result = command.execute();
-        query.complete();
-        return result;
     }
 
     /**
@@ -240,8 +245,7 @@ public Sql<?> getSql() {
         if (query.getMethodName() == null) {
             query.setCallerMethodName("getSql");
         }
-        query.setSqlNode(helper.getSqlNode());
-        query.prepare();
+        prepare();
         return query.getSql();
     }
 

src/main/java/org/seasar/doma/jdbc/builder/SelectBuilder.java

@@ -780,18 +780,23 @@ public <RESULT> RESULT streamMap(MapKeyNamingType mapKeyNamingType,
     }
 
     private <RESULT> RESULT execute(ResultSetHandler<RESULT> resultSetHandler) {
-        for (Param p : helper.getParams()) {
-            query.addParameter(p.name, p.paramClass, p.param);
-        }
-        query.setSqlNode(helper.getSqlNode());
-        query.prepare();
+        prepare();
         SelectCommand<RESULT> command = new SelectCommand<RESULT>(query,
                 resultSetHandler);
         RESULT result = command.execute();
         query.complete();
         return result;
     }
 
+    private void prepare() {
+        query.clearParameters();
+        for (Param p : helper.getParams()) {
+            query.addParameter(p.name, p.paramClass, p.param);
+        }
+        query.setSqlNode(helper.getSqlNode());
+        query.prepare();
+    }
+
     /**
      * 結果が少なくとも1件以上存在することを保証します。
      * 
@@ -932,8 +937,7 @@ public Sql<?> getSql() {
         if (query.getMethodName() == null) {
             query.setCallerMethodName("getSql");
         }
-        query.setSqlNode(helper.getSqlNode());
-        query.prepare();
+        prepare();
         return query.getSql();
     }
 

src/main/java/org/seasar/doma/jdbc/builder/UpdateBuilder.java

@@ -164,15 +164,20 @@ public int execute() {
         if (query.getMethodName() == null) {
             query.setCallerMethodName("execute");
         }
+        prepare();
+        UpdateCommand command = new UpdateCommand(query);
+        int result = command.execute();
+        query.complete();
+        return result;
+    }
+
+    private void prepare() {
+        query.clearParameters();
         for (Param p : helper.getParams()) {
             query.addParameter(p.name, p.paramClass, p.param);
         }
         query.setSqlNode(helper.getSqlNode());
         query.prepare();
-        UpdateCommand command = new UpdateCommand(query);
-        int result = command.execute();
-        query.complete();
-        return result;
     }
 
     /**
@@ -244,8 +249,7 @@ public Sql<?> getSql() {
         if (query.getMethodName() == null) {
             query.setCallerMethodName("getSql");
         }
-        query.setSqlNode(helper.getSqlNode());
-        query.prepare();
+        prepare();
         return query.getSql();
     }
 

src/main/java/org/seasar/doma/jdbc/query/AbstractSelectQuery.java

@@ -157,6 +157,10 @@ public void addParameters(Map<String, Value> parameters) {
         this.parameters.putAll(parameters);
     }
 
+    public void clearParameters() {
+        this.parameters.clear();
+    }
+
     @Override
     public boolean isResultEnsured() {
         return resultEnsured;

src/main/java/org/seasar/doma/jdbc/query/SqlModifyQuery.java

@@ -90,6 +90,10 @@ public void addParameter(String name, Class<?> type, Object value) {
         parameters.put(name, new Value(type, value));
     }
 
+    public void clearParameters() {
+        parameters.clear();
+    }
+
     public void setSqlLogType(SqlLogType sqlLogType) {
         this.sqlLogType = sqlLogType;
     }

src/test/java/org/seasar/doma/jdbc/builder/DeleteBuilderTest.java

@@ -34,4 +34,20 @@ public void test() throws Exception {
         builder.sql("salary = ").param(int.class, 10);
         builder.execute();
     }
+
+    public void testGetSql() throws Exception {
+        DeleteBuilder builder = DeleteBuilder.newInstance(new MockConfig());
+        builder.sql("delete from Emp");
+        builder.sql("where");
+        builder.sql("name = ").param(String.class, "aaa");
+        builder.sql("and");
+        builder.sql("salary = ").param(int.class, 10);
+
+        String sql = String.format("delete from Emp%n" + "where%n"
+                + "name = ?%n" + "and%n" + "salary = ?");
+        assertEquals(sql, builder.getSql().getRawSql());
+
+        builder.execute();
+    }
+
 }

src/test/java/org/seasar/doma/jdbc/builder/InsertBuilderTest.java

@@ -34,4 +34,20 @@ public void test() throws Exception {
         builder.param(int.class, 100).sql(")");
         builder.execute();
     }
+
+    public void testGetSql() throws Exception {
+        InsertBuilder builder = InsertBuilder.newInstance(new MockConfig());
+        builder.sql("insert into Emp");
+        builder.sql("(name, salary)");
+        builder.sql("values (");
+        builder.param(String.class, "SMITH").sql(", ");
+        builder.param(int.class, 100).sql(")");
+
+        String sql = String.format("insert into Emp%n" + "(name, salary)%n"
+                + "values (?, ?)");
+        assertEquals(sql, builder.getSql().getRawSql());
+
+        builder.execute();
+    }
+
 }

src/test/java/org/seasar/doma/jdbc/builder/SelectBuilderTest.java

@@ -33,6 +33,27 @@
  */
 public class SelectBuilderTest extends TestCase {
 
+    public void testGetSql() throws Exception {
+        SelectBuilder builder = SelectBuilder.newInstance(new MockConfig());
+        builder.sql("select");
+        builder.sql("id").sql(",");
+        builder.sql("name").sql(",");
+        builder.sql("salary");
+        builder.sql("from Emp");
+        builder.sql("where");
+        builder.sql("name like ").param(String.class, "S%");
+        builder.sql("and");
+        builder.sql("age > ").param(int.class, 20);
+
+        String sql = String.format("select%n" + "id,%n" + "name,%n"
+                + "salary%n" + "from Emp%n" + "where%n" + "name like ?%n"
+                + "and%n" + "age > ?");
+        assertEquals(sql, builder.getSql().getRawSql());
+
+        Emp emp = builder.getEntitySingleResult(Emp.class);
+        assertNull(emp);
+    }
+
     public void testRmoveLast() throws Exception {
         SelectBuilder builder = SelectBuilder.newInstance(new MockConfig());
         builder.sql("aaa").sql("bbb");

src/test/java/org/seasar/doma/jdbc/builder/UpdateBuilderTest.java

@@ -38,4 +38,21 @@ public void test() throws Exception {
         builder.sql("ID = ").param(int.class, 10);
         builder.execute();
     }
+
+    public void testGetSql() throws Exception {
+        UpdateBuilder builder = UpdateBuilder.newInstance(new MockConfig());
+        builder.sql("update Emp");
+        builder.sql("set");
+        builder.sql("name = ").param(String.class, "SMIHT").sql(",");
+        builder.sql("salary = ")
+                .param(BigDecimal.class, new BigDecimal("1000"));
+        builder.sql("where");
+        builder.sql("ID = ").param(int.class, 10);
+
+        String sql = String.format("update Emp%n" + "set%n" + "name = ?,%n"
+                + "salary = ?%n" + "where%n" + "ID = ?");
+        assertEquals(sql, builder.getSql().getRawSql());
+
+        builder.execute();
+    }
 }