Consider the trailing semi-colon in SQL transformation (#631)

Author: nakamura-to

doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/SqlParser.java

@@ -562,7 +562,7 @@ protected void parseEOL() {
   }
 
   protected void parseDelimiter() {
-    appendNode(OtherNode.of(token));
+    rootNode.appendNode(OtherNode.of(token));
   }
 
   protected boolean containsOnlyWhitespaces(SqlNode node) {

doma-core/src/test/java/org/seasar/doma/internal/jdbc/dialect/H2PagingTransformerTest.java

@@ -25,6 +25,18 @@ public void testOffsetLimit() {
     assertEquals(expected, sql.getRawSql());
   }
 
+  @Test
+  public void testOffsetLimit_semicolon() {
+    String expected = "select * from emp order by emp.id limit 10 offset 5;";
+    H2PagingTransformer transformer = new H2PagingTransformer(5, 10);
+    SqlParser parser = new SqlParser("select * from emp order by emp.id;");
+    SqlNode sqlNode = transformer.transform(parser.parse());
+    NodePreparedSqlBuilder sqlBuilder =
+        new NodePreparedSqlBuilder(new MockConfig(), SqlKind.SELECT, "dummyPath");
+    PreparedSql sql = sqlBuilder.build(sqlNode, Function.identity());
+    assertEquals(expected, sql.getRawSql());
+  }
+
   @Test
   public void testOffsetLimit_forUpdate() {
     String expected = "select * from emp order by emp.id  limit 10 offset 5 for update";
@@ -37,6 +49,18 @@ public void testOffsetLimit_forUpdate() {
     assertEquals(expected, sql.getRawSql());
   }
 
+  @Test
+  public void testOffsetLimit_forUpdate_semicolon() {
+    String expected = "select * from emp order by emp.id  limit 10 offset 5 for update;";
+    H2PagingTransformer transformer = new H2PagingTransformer(5, 10);
+    SqlParser parser = new SqlParser("select * from emp order by emp.id for update;");
+    SqlNode sqlNode = transformer.transform(parser.parse());
+    NodePreparedSqlBuilder sqlBuilder =
+        new NodePreparedSqlBuilder(new MockConfig(), SqlKind.SELECT, "dummyPath");
+    PreparedSql sql = sqlBuilder.build(sqlNode, Function.identity());
+    assertEquals(expected, sql.getRawSql());
+  }
+
   @Test
   public void testOffsetOnly() {
     String expected = "select * from emp order by emp.id limit -1 offset 5";