fix: handle transaction sql with comments at the beginning and set tr…

…ansaction status in setAutoCommit
aws · Sep 26, 2022 · a50fdc4 · a50fdc4
1 parent 861e93c
commit a50fdc4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/wrapper/src/main/java/software/amazon/jdbc/plugin/DefaultConnectionPlugin.java b/wrapper/src/main/java/software/amazon/jdbc/plugin/DefaultConnectionPlugin.java
@@ -158,7 +158,7 @@ public void notifyNodeListChanged(Map<String, EnumSet<NodeChangeOptions>> change
 
   public boolean doesOpenTransaction(String statement) {
     statement = statement.toUpperCase();
-    statement = statement.replaceAll("START(?:\\s*/\\*(.*?)\\*/\\s*)TRANSACTION", "START TRANSACTION");
+    statement = statement.replaceAll("\\s*/\\*(.*?)\\*/\\s*", " ").trim();
     return statement.startsWith("BEGIN") || statement.startsWith("START TRANSACTION");
   }
 

diff --git a/wrapper/src/main/java/software/amazon/jdbc/wrapper/ConnectionWrapper.java b/wrapper/src/main/java/software/amazon/jdbc/wrapper/ConnectionWrapper.java
@@ -688,7 +688,10 @@ public void setAutoCommit(boolean autoCommit) throws SQLException {
         this.pluginManager,
         this.pluginService.getCurrentConnection(),
         "Connection.setAutoCommit",
-        () -> this.pluginService.getCurrentConnection().setAutoCommit(autoCommit),
+        () -> {
+          this.pluginService.getCurrentConnection().setAutoCommit(autoCommit);
+          this.pluginManagerService.setInTransaction(true);
+        },
         autoCommit);
   }
 

diff --git a/wrapper/src/test/java/software/amazon/jdbc/plugin/DefaultConnectionPluginTest.java b/wrapper/src/test/java/software/amazon/jdbc/plugin/DefaultConnectionPluginTest.java
@@ -84,6 +84,9 @@ private static Stream<Arguments> openTransactionQueries() {
         Arguments.of("START/* COMMENT */TRANSACTION;", true),
         Arguments.of("START      /* COMMENT */    TRANSACTION;", true),
         Arguments.of("START   /*COMMENT*/TRANSACTION;", true),
+        Arguments.of("/*COMMENT*/START   /*COMMENT*/TRANSACTION;", true),
+        Arguments.of(" /*COMMENT*/ START   /*COMMENT*/TRANSACTION;", true),
+        Arguments.of(" /*COMMENT*/ begin", true),
         Arguments.of("commit", false)
     );
   }