WIP: refs #570

testcontainers · Feb 3, 2018 · ca506a2 · ca506a2
1 parent 198fa8c
commit ca506a2
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java b/modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java
@@ -116,6 +116,7 @@ public static void splitSqlScript(String resource, String script, String separat
 		StringBuilder sb = new StringBuilder();
 		boolean inLiteral = false;
 		boolean inEscape = false;
+		int blockDepth = 0;
 		char[] content = script.toCharArray();
 		for (int i = 0; i < script.length(); i++) {
 			char c = content[i];
@@ -133,7 +134,13 @@ public static void splitSqlScript(String resource, String script, String separat
 			if (c == '\'') {
 				inLiteral = !inLiteral;
 			}
-			if (!inLiteral) {
+			if (contentMatches(content, i, "BEGIN")) {
+				blockDepth++;
+			}
+			if (contentMatches(content, i, "END")) {
+				blockDepth--;
+			}
+			if (!inLiteral && blockDepth == 0) {
 				if (script.startsWith(separator, i)) {
 					// we've reached the end of the current statement
 					if (sb.length() > 0) {
@@ -185,6 +192,21 @@ else if (c == ' ' || c == '\n' || c == '\t') {
 		}
 	}
 
+	private static boolean contentMatches(char[] content, int offset, String needle) {
+		final char[] needleChars = needle.toCharArray();
+		final int end = offset + needleChars.length;
+		if (content.length < end) {
+			return false;
+		}
+
+		for (int i = 0; i < needleChars.length; i++) {
+			if (Character.toLowerCase(content[offset + i]) != Character.toLowerCase(needleChars[i])) {
+				return false;
+			}
+		}
+		return true;
+	}
+
 	private static void checkArgument(boolean expression, String errorMessage) {
 		if (!expression) {
 			throw new IllegalArgumentException(errorMessage);

diff --git a/modules/jdbc-test/src/test/resources/somepath/init_mysql.sql b/modules/jdbc-test/src/test/resources/somepath/init_mysql.sql
@@ -2,4 +2,20 @@ CREATE TABLE bar (
   foo VARCHAR(255)
 );
 
-INSERT INTO bar (foo) VALUES ('hello world');
+INSERT INTO bar (foo) VALUES ('hello world');
+
+DROP PROCEDURE IF EXISTS count_foo;
+
+CREATE PROCEDURE count_foo()
+BEGIN
+
+  -- we can do comments
+
+  /* including block
+     comments
+   */
+
+select * from bar;
+select 1 from dual;
+
+END;