rpygithub
diff --git a/‎modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java‎
Lines changed: 1 addition & 1 deletion b/‎modules/database-commons/src/main/java/org/testcontainers/ext/ScriptUtils.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎modules/database-commons/src/test/java/org/testcontainers/ext/ScriptUtilsTest.java‎
Lines changed: 17 additions & 0 deletions b/‎modules/database-commons/src/test/java/org/testcontainers/ext/ScriptUtilsTest.java‎
Lines changed: 17 additions & 0 deletions
@@ -206,7 +206,7 @@ else if (script.startsWith(blockCommentStartDelimiter, i)) {
 							blockCommentEndDelimiter), resource);
 					}
 				}
-				else if (c == ' ' || c == '\n' || c == '\t') {
+				else if (c == ' ' || c == '\n' || c == '\t' || c == '\r') {
 					// avoid multiple adjacent whitespace characters
 					if (sb.length() > 0 && sb.charAt(sb.length() - 1) != ' ') {
 						c = ' ';
 
@@ -28,4 +28,21 @@ public void testSplit() throws IOException {
         assertEquals("SELECT * from `bar`", statements.get(4));
         assertEquals("INSERT INTO bar (foo) VALUES ('hello world')", statements.get(6));
     }
+
+    /*
+     * Test ScriptUtils script splitting with some ugly/hard-to-split cases and linux line endings
+     */
+    @Test
+    public void testSplitWithWidnwosLineEnding() throws IOException {
+        final String script = Resources.toString(Resources.getResource("splittable.sql"), Charsets.UTF_8);
+        final String scriptWithWindowsLineEndings = script.replaceAll("\n", "\r\n");
+        final List<String> statements = new ArrayList<>();
+        ScriptUtils.splitSqlScript("resourcename", scriptWithWindowsLineEndings, ";", "--", "/*", "*/", statements);
+
+        assertEquals(7, statements.size());
+        assertEquals("SELECT \"a /* string literal containing comment characters like -- here\"", statements.get(2));
+        assertEquals("SELECT \"a 'quoting' \\\"scenario ` involving BEGIN keyword\\\" here\"", statements.get(3));
+        assertEquals("SELECT * from `bar`", statements.get(4));
+        assertEquals("INSERT INTO bar (foo) VALUES ('hello world')", statements.get(6));
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ else if (script.startsWith(blockCommentStartDelimiter, i)) {`
`206`	`206`	`blockCommentEndDelimiter), resource);`
`207`	`207`	`}`
`208`	`208`	`}`
`209`		`- else if (c == ' ' \|\| c == '\n' \|\| c == '\t') {`
	`209`	`+ else if (c == ' ' \|\| c == '\n' \|\| c == '\t' \|\| c == '\r') {`
`210`	`210`	`// avoid multiple adjacent whitespace characters`
`211`	`211`	`if (sb.length() > 0 && sb.charAt(sb.length() - 1) != ' ') {`
`212`	`212`	`c = ' ';`