Skip to content

Commit b96ee07

Browse files
committed
Fix NullPointerException in ContainerLessJdbcDelegate when using ScriptUtils
1 parent af38cb6 commit b96ee07

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

modules/jdbc/src/main/java/org/testcontainers/jdbc/JdbcDatabaseDelegate.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,25 @@ protected Statement createNewConnection() {
4040

4141
@Override
4242
public void execute(
43-
String statement,
44-
String scriptPath,
45-
int lineNumber,
46-
boolean continueOnError,
47-
boolean ignoreFailedDrops) {
43+
String statement,
44+
String scriptPath,
45+
int lineNumber,
46+
boolean continueOnError,
47+
boolean ignoreFailedDrops
48+
) {
4849
try {
4950
boolean rowsAffected = getConnection().execute(statement);
5051
log.debug("{} returned as updateCount for SQL: {}", rowsAffected, statement);
5152
} catch (SQLException ex) {
5253
boolean dropStatement = statement.trim().toLowerCase().startsWith("drop");
5354
if (continueOnError || (dropStatement && ignoreFailedDrops)) {
5455
log.debug(
55-
"Failed to execute SQL script statement at line {} of resource {}: {}",
56-
lineNumber,
57-
scriptPath,
58-
statement,
59-
ex);
56+
"Failed to execute SQL script statement at line {} of resource {}: {}",
57+
lineNumber,
58+
scriptPath,
59+
statement,
60+
ex
61+
);
6062
} else {
6163
throw new ScriptUtils.ScriptStatementFailedException(statement, lineNumber, scriptPath, ex);
6264
}

modules/jdbc/src/test/java/org/testcontainers/jdbc/ContainerLessJdbcDelegateTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ void closeClosesStatementAndConnectionQuietly() throws Exception {
2626
verify(statement).close();
2727
verify(connection).close();
2828
}
29-
}
29+
}

0 commit comments

Comments
 (0)