From a804dc7aff808fcecff6305d0408f6bcbddf936b Mon Sep 17 00:00:00 2001
From: Samuel <45127751+samyuh@users.noreply.github.com>
Date: Mon, 23 Mar 2026 19:59:52 +0000
Subject: [PATCH 1/3] fix: shutdown executor in PostgreSqlEngine

---
 .../sql/abstraction/engine/impl/PostgreSqlEngine.java       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/PostgreSqlEngine.java b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/PostgreSqlEngine.java
index 864020ca..1db75103 100644
--- a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/PostgreSqlEngine.java
+++ b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/PostgreSqlEngine.java
@@ -696,4 +696,10 @@ private int executeUpdateQuery(final String query) throws SQLException {
             scheduledFutureLog.cancel(true);
         }
     }
+
+    @Override
+    public synchronized void close() {
+        this.executor.shutdownNow();
+        super.close();
+    }
 }

From f7c547ad9395846a11e614ccd511e5f4130bc4fe Mon Sep 17 00:00:00 2001
From: Samuel <45127751+samyuh@users.noreply.github.com>
Date: Mon, 23 Mar 2026 20:04:55 +0000
Subject: [PATCH 2/3] fix: shutdown executor in PostgreSqlEngine

---
 .../abstraction/engine/impl/PostgreSqlEngine.java    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/PostgreSqlEngine.java b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/PostgreSqlEngine.java
index 1db75103..24fc3987 100644
--- a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/PostgreSqlEngine.java
+++ b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/PostgreSqlEngine.java
@@ -699,7 +699,17 @@ private int executeUpdateQuery(final String query) throws SQLException {
 
     @Override
     public synchronized void close() {
-        this.executor.shutdownNow();
+        this.executor.shutdown();
+        try {
+            if (!this.executor.awaitTermination(10L, TimeUnit.SECONDS)) {
+                this.executor.shutdownNow();
+                this.executor.awaitTermination(10L, TimeUnit.SECONDS);
+            }
+        } catch (final InterruptedException ie) {
+            Thread.currentThread().interrupt();
+            this.executor.shutdownNow();
+        }
+
         super.close();
     }
 }

From ba30af1a112a39ec7d6bac39a0ed5ff58d770ba2 Mon Sep 17 00:00:00 2001
From: Samuel <45127751+samyuh@users.noreply.github.com>
Date: Tue, 24 Mar 2026 10:03:52 +0000
Subject: [PATCH 3/3] fix: add missing import

---
 .../commons/sql/abstraction/engine/impl/PostgreSqlEngine.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/PostgreSqlEngine.java b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/PostgreSqlEngine.java
index 24fc3987..e452e802 100644
--- a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/PostgreSqlEngine.java
+++ b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/PostgreSqlEngine.java
@@ -40,7 +40,7 @@
 import org.postgresql.PGProperty;
 import org.postgresql.util.PGobject;
 
-
+import java.lang.Thread;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;