From 1a822593fbb767ce8b0a5a2b86420c286bb60cc4 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@samskivert.com>
Date: Wed, 1 Oct 2014 11:29:45 -0700
Subject: [PATCH] Tx connections are always read-write.

---
 .../com/samskivert/jdbc/ConnectionProvider.java    | 10 +++++-----
 .../jdbc/DataSourceConnectionProvider.java         | 14 ++++++--------
 .../samskivert/jdbc/StaticConnectionProvider.java  |  9 ++++-----
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/samskivert/jdbc/ConnectionProvider.java b/src/main/java/com/samskivert/jdbc/ConnectionProvider.java
index 6195a241..86686fa0 100644
--- a/src/main/java/com/samskivert/jdbc/ConnectionProvider.java
+++ b/src/main/java/com/samskivert/jdbc/ConnectionProvider.java
@@ -66,21 +66,21 @@ public interface ConnectionProvider
     void connectionFailed (String ident, boolean readOnly, Connection conn, SQLException error);
 
     /**
-     * Returns a connection that can be used in a transaction. See {@link #getConnection}.
+     * Returns a connection that can be used in a transaction. See {@link #getConnection}. Note:
+     * transaction connections are never read-only. What would be the point?
      */
-    Connection getTxConnection (String ident, boolean readOnly)
-        throws PersistenceException;
+    Connection getTxConnection (String ident) throws PersistenceException;
 
     /**
      * Releases a connection obtained by {@link #getTxConnection}. See {@link #releaseConnection}.
      */
-    void releaseTxConnection (String ident, boolean readOnly, Connection conn);
+    void releaseTxConnection (String ident, Connection conn);
 
     /**
      * Reports failure of a connection obtained by {@link #getTxConnection}. See {@link
      * #connectionFailed}.
      */
-    void txConnectionFailed (String ident, boolean readOnly, Connection conn, SQLException error);
+    void txConnectionFailed (String ident, Connection conn, SQLException error);
 
     /**
      * Returns the URL associated with this database identifier. This should be the same value that
diff --git a/src/main/java/com/samskivert/jdbc/DataSourceConnectionProvider.java b/src/main/java/com/samskivert/jdbc/DataSourceConnectionProvider.java
index b4e11c37..cec67f97 100644
--- a/src/main/java/com/samskivert/jdbc/DataSourceConnectionProvider.java
+++ b/src/main/java/com/samskivert/jdbc/DataSourceConnectionProvider.java
@@ -80,26 +80,24 @@ public class DataSourceConnectionProvider implements ConnectionProvider
     }
 
     // from ConnectionProvider
-    public Connection getTxConnection (String ident, boolean readOnly)
-        throws PersistenceException
+    public Connection getTxConnection (String ident) throws PersistenceException
     {
         // our connections are pooled, so we can just get them normally
-        return getConnection(ident, readOnly);
+        return getConnection(ident, false);
     }
 
     // from ConnectionProvider
-    public void releaseTxConnection (String ident, boolean readOnly, Connection conn)
+    public void releaseTxConnection (String ident, Connection conn)
     {
         // our connections are pooled, so we can just release them normally
-        releaseConnection(ident, readOnly, conn);
+        releaseConnection(ident, false, conn);
     }
 
     // from ConnectionProvider
-    public void txConnectionFailed (String ident, boolean readOnly, Connection conn,
-                                    SQLException error)
+    public void txConnectionFailed (String ident, Connection conn, SQLException error)
     {
         // our connections are pooled, so we can just fail them normally
-        connectionFailed(ident, readOnly, conn, error);
+        connectionFailed(ident, false, conn, error);
     }
 
     // from ConnectionProvider
diff --git a/src/main/java/com/samskivert/jdbc/StaticConnectionProvider.java b/src/main/java/com/samskivert/jdbc/StaticConnectionProvider.java
index d966634c..cc34495e 100644
--- a/src/main/java/com/samskivert/jdbc/StaticConnectionProvider.java
+++ b/src/main/java/com/samskivert/jdbc/StaticConnectionProvider.java
@@ -128,20 +128,19 @@ public class StaticConnectionProvider implements ConnectionProvider
     }
 
     // from ConnectionProvider
-    public Connection getTxConnection (String ident, boolean readOnly) throws PersistenceException
+    public Connection getTxConnection (String ident) throws PersistenceException
     {
-        return getMapping(ident, readOnly).openConnection(ident, null);
+        return getMapping(ident, false).openConnection(ident, null);
     }
 
     // from ConnectionProvider
-    public void releaseTxConnection (String ident, boolean readOnly, Connection conn)
+    public void releaseTxConnection (String ident, Connection conn)
     {
         close(conn, ident);
     }
 
     // from ConnectionProvider
-    public void txConnectionFailed (
-        String ident, boolean readOnly, Connection conn, SQLException error)
+    public void txConnectionFailed (String ident, Connection conn, SQLException error)
     {
         close(conn, ident);
     }