Keep semicolons after END when semicolon is not the separator (testco…

…ntainers#8108)
chadlwilson · Jan 15, 2024 · 4ff8d1d · 4ff8d1d
1 parent 36c8727
commit 4ff8d1d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptSplitter.java b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptSplitter.java
@@ -101,8 +101,8 @@ private boolean endOfBlock(boolean recursive) {
                     if (";".equals(scanner.getCurrentMatch())) {
                         if (recursive) {
                             sb.append(temporary);
-                            appendMatch();
                         }
+                        appendMatch();
                         return true;
                     }
                     sb.append(temporary);

diff --git a/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java b/modules/database-commons/src/test/java/org/testcontainers/ext/ScriptSplittingTest.java
@@ -320,12 +320,19 @@ public void testIfLoopBlocksSpecificSeparator() {
             "        IF something_wrong THEN LEAVE rec_loop; END IF;\n" +
             "        do_something_else;\n" +
             "    END LOOP;\n" +
-            "END",
+            "END;",
             "CALL something();"
         );
         splitAndCompare(script, expected, "@");
     }
 
+    @Test
+    public void oracleStyleBlocks() {
+        String script = "BEGIN END; /\n" + "BEGIN END;";
+        List<String> expected = Arrays.asList("BEGIN END;", "BEGIN END;");
+        splitAndCompare(script, expected, "/");
+    }
+
     @Test
     public void testMultiProcedureMySQLScript() {
         String script =