Fix NullPointerException in ContainerLessJdbcDelegate when using ScriptUtils

Author: himi-sh

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

@@ -33,4 +33,23 @@ protected Statement createNewConnection() {
             throw new ConnectionCreationException("Could create JDBC statement", e);
         }
     }
+
+    @Override
+    protected void closeConnectionQuietly(Statement statement) {
+        if (statement != null) {
+            try {
+                statement.close();
+            } catch (Exception e) {
+                log.error("Could not close JDBC connection", e);
+            }
+        }
+
+        if (connection != null) {
+            try {
+                connection.close();
+            } catch (Exception e) {
+                log.error("Could not close JDBC connection", e);
+            }
+        }
+    }
 }

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

@@ -40,25 +40,23 @@ protected Statement createNewConnection() {
 
     @Override
     public void execute(
-        String statement,
-        String scriptPath,
-        int lineNumber,
-        boolean continueOnError,
-        boolean ignoreFailedDrops
-    ) {
+            String statement,
+            String scriptPath,
+            int lineNumber,
+            boolean continueOnError,
+            boolean ignoreFailedDrops) {
         try {
             boolean rowsAffected = getConnection().execute(statement);
             log.debug("{} returned as updateCount for SQL: {}", rowsAffected, statement);
         } catch (SQLException ex) {
             boolean dropStatement = statement.trim().toLowerCase().startsWith("drop");
             if (continueOnError || (dropStatement && ignoreFailedDrops)) {
                 log.debug(
-                    "Failed to execute SQL script statement at line {} of resource {}: {}",
-                    lineNumber,
-                    scriptPath,
-                    statement,
-                    ex
-                );
+                        "Failed to execute SQL script statement at line {} of resource {}: {}",
+                        lineNumber,
+                        scriptPath,
+                        statement,
+                        ex);
             } else {
                 throw new ScriptUtils.ScriptStatementFailedException(statement, lineNumber, scriptPath, ex);
             }

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

@@ -0,0 +1,29 @@
+package org.testcontainers.jdbc;
+
+import org.junit.jupiter.api.Test;
+
+import java.sql.Connection;
+import java.sql.Statement;
+
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class ContainerLessJdbcDelegateTest {
+
+    @Test
+    void closeClosesStatementAndConnectionQuietly() throws Exception {
+        Connection connection = mock(Connection.class);
+        Statement statement = mock(Statement.class);
+        when(connection.createStatement()).thenReturn(statement);
+
+        ContainerLessJdbcDelegate delegate = new ContainerLessJdbcDelegate(connection);
+        delegate.execute("select 1", "test.sql", 1, false, false);
+
+        assertThatCode(delegate::close).doesNotThrowAnyException();
+
+        verify(statement).close();
+        verify(connection).close();
+    }
+}