Preserve auto commit state (#284)

Preserve an auto-commit state of a JDBC connection

Author: nakamura-to

src/main/java/org/seasar/doma/jdbc/tx/LocalTransaction.java

@@ -130,6 +130,7 @@ protected void beginInternal(
     context.begin(
         () -> {
           Connection connection = JdbcUtil.getConnection(dataSource);
+
           int transactionIsolation;
           try {
             transactionIsolation = connection.getTransactionIsolation();
@@ -147,13 +148,24 @@ protected void beginInternal(
               throw new JdbcException(Message.DOMA2055, e, transactionIsolationLevel.name(), e);
             }
           }
+
+          boolean isAutoCommit;
           try {
-            connection.setAutoCommit(false);
+            isAutoCommit = connection.getAutoCommit();
           } catch (SQLException e) {
             closeConnection(connection);
-            throw new JdbcException(Message.DOMA2041, e, e);
+            throw new JdbcException(Message.DOMA2084, e, e);
+          }
+          if (isAutoCommit) {
+            try {
+              connection.setAutoCommit(false);
+            } catch (SQLException e) {
+              closeConnection(connection);
+              throw new JdbcException(Message.DOMA2041, e, e);
+            }
           }
-          return new LocalTransactionConnection(connection, transactionIsolation);
+
+          return new LocalTransactionConnection(connection, transactionIsolation, isAutoCommit);
         });
     jdbcLogger.logTransactionBegun(className, callerMethodName, context.getId());
   }
@@ -408,8 +420,10 @@ protected void release(LocalTransactionContext context, String callerMethodName)
     if (!context.hasConnection()) {
       return;
     }
-    LocalTransactionConnection connection = context.getConnection();
-    int isolationLevel = connection.getPreservedTransactionIsolation();
+    LocalTransactionConnection localTransactionConnection = context.getConnection();
+    Connection connection = localTransactionConnection.getWrappedConnection();
+
+    int isolationLevel = localTransactionConnection.getPreservedTransactionIsolation();
     if (isolationLevel != Connection.TRANSACTION_NONE) {
       try {
         connection.setTransactionIsolation(isolationLevel);
@@ -418,12 +432,17 @@ protected void release(LocalTransactionContext context, String callerMethodName)
             className, callerMethodName, isolationLevel, ignored);
       }
     }
-    try {
-      connection.setAutoCommit(true);
-    } catch (SQLException ignored) {
-      jdbcLogger.logAutoCommitEnablingFailure(className, callerMethodName, ignored);
+
+    boolean isAutoCommit = localTransactionConnection.getPreservedAutoCommitState();
+    if (isAutoCommit) {
+      try {
+        connection.setAutoCommit(true);
+      } catch (SQLException ignored) {
+        jdbcLogger.logAutoCommitEnablingFailure(className, callerMethodName, ignored);
+      }
     }
-    closeConnection(connection.getWrappedConnection());
+
+    closeConnection(connection);
   }
 
   protected void closeConnection(Connection connection) {

src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionConnection.java

@@ -21,23 +21,32 @@ class LocalTransactionConnection implements Connection {
 
   private final int preservedTransactionIsolation;
 
+  private final boolean preservedAutoCommitState;
+
   /**
    * Creates an instance.
    *
    * @param connection the internal connection
    * @param preservedTransactionIsolation the transaction isolation to be preserved
+   * @param preservedAutoCommitState the auto commit state to be preserved
    */
-  public LocalTransactionConnection(Connection connection, int preservedTransactionIsolation) {
+  public LocalTransactionConnection(
+      Connection connection, int preservedTransactionIsolation, boolean preservedAutoCommitState) {
     assertNotNull(connection);
     assertTrue(!(connection instanceof LocalTransactionConnection));
     this.connection = connection;
     this.preservedTransactionIsolation = preservedTransactionIsolation;
+    this.preservedAutoCommitState = preservedAutoCommitState;
   }
 
   protected int getPreservedTransactionIsolation() {
     return this.preservedTransactionIsolation;
   }
 
+  protected boolean getPreservedAutoCommitState() {
+    return preservedAutoCommitState;
+  }
+
   /**
    * Returns the wrapped internal connection.
    *

src/main/java/org/seasar/doma/message/Message.java

@@ -101,6 +101,7 @@ public enum Message implements MessageResource {
   DOMA2081("Pessimistic locking with aliases and WAIT option is not supported in the DBMS[{0}]."),
   DOMA2082("Pessimistic locking with aliases and NOWAIT option is not supported in the DBMS[{0}]."),
   DOMA2083("Cannot reserve identity values for the entity[{0}]. The cause is as follows: {1}"),
+  DOMA2084("Cannot get the auto commit state. The cause is as follows: {0}"),
   DOMA2101(
       "Failed to parse the SQL on line [{1}] at column [{2}]. The quotation mark \"''\" that indicates the end of a string literal is not found. SQL[{0}]"),
   DOMA2102(

src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionConnectionTest.java

@@ -10,7 +10,7 @@ public class LocalTransactionConnectionTest extends TestCase {
   public void testIsWrapperFor() throws Exception {
     try (Connection connection =
         new LocalTransactionConnection(
-            new MockConnection(), Connection.TRANSACTION_READ_COMMITTED)) {
+            new MockConnection(), Connection.TRANSACTION_READ_COMMITTED, true)) {
       assertTrue(connection.isWrapperFor(LocalTransactionConnection.class));
       assertTrue(connection.isWrapperFor(MockConnection.class));
       assertFalse(connection.isWrapperFor(Runnable.class));
@@ -20,7 +20,7 @@ public void testIsWrapperFor() throws Exception {
   public void testUnwrap() throws Exception {
     try (Connection connection =
         new LocalTransactionConnection(
-            new MockConnection(), Connection.TRANSACTION_READ_COMMITTED)) {
+            new MockConnection(), Connection.TRANSACTION_READ_COMMITTED, true)) {
       assertNotNull(connection.unwrap(LocalTransactionConnection.class));
       assertNotNull(connection.unwrap(LocalTransactionConnection.class));
       try {

src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionContextTest.java

@@ -11,7 +11,7 @@ public class LocalTransactionContextTest extends TestCase {
   public void testReleaseAndGetSavepoint() throws Exception {
     try (LocalTransactionConnection connection =
         new LocalTransactionConnection(
-            new MockConnection(), Connection.TRANSACTION_READ_COMMITTED)) {
+            new MockConnection(), Connection.TRANSACTION_READ_COMMITTED, true)) {
       LocalTransactionContext context = new LocalTransactionContext();
       context.addSavepoint("1", new MySavepoint("1"));
       context.addSavepoint("2", new MySavepoint("2"));