Patch from Aaron Mulder to have pooled connections implement PGConnection

Barry Lind · Barry Lind · commit 9db065ba5655 · 2003-01-14T05:46:49.000Z
Modified Files:
 	jdbc/org/postgresql/jdbc2/optional/PooledConnectionImpl.java
 	jdbc/org/postgresql/test/jdbc2/optional/BaseDataSourceTest.java
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/optional/PooledConnectionImpl.java b/src/interfaces/jdbc/org/postgresql/jdbc2/optional/PooledConnectionImpl.java
@@ -4,6 +4,7 @@
 import java.sql.*;
 import java.util.*;
 import java.lang.reflect.*;
+import org.postgresql.PGConnection;
 
 /**
  * PostgreSQL implementation of the PooledConnection interface.  This shouldn't
@@ -12,7 +13,7 @@
  * @see ConnectionPool
  *
  * @author Aaron Mulder (ammulder@chariotsolutions.com)
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
  */
 public class PooledConnectionImpl implements PooledConnection
 {
@@ -114,7 +115,7 @@ public Connection getConnection() throws SQLException
 		con.setAutoCommit(autoCommit);
 		ConnectionHandler handler = new ConnectionHandler(con);
 		last = handler;
-		Connection con = (Connection)Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{Connection.class}, handler);
+		Connection con = (Connection)Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{Connection.class, PGConnection.class}, handler);
         last.setProxy(con);
         return con;
 	}
@@ -213,7 +214,7 @@ public Object invoke(Object proxy, Method method, Object[] args)
                                     throw e.getTargetException();
                                 }
 			}
-			// All the rest is from the Connection interface
+			// All the rest is from the Connection or PGConnection interface
 			if (method.getName().equals("isClosed"))
 			{
 				return con == null ? Boolean.TRUE : Boolean.FALSE;
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/BaseDataSourceTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/BaseDataSourceTest.java
@@ -3,6 +3,7 @@
 import junit.framework.TestCase;
 import org.postgresql.test.TestUtil;
 import org.postgresql.jdbc2.optional.BaseDataSource;
+import org.postgresql.PGConnection;
 
 import java.sql.*;
 import java.util.*;
@@ -16,7 +17,7 @@
  * tests.
  *
  * @author Aaron Mulder (ammulder@chariotsolutions.com)
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
  */
 public abstract class BaseDataSourceTest extends TestCase
 {
@@ -179,6 +180,24 @@ public void testNotPooledConnection()
 		}
 	}
 
+    /**
+     * Test to make sure that PGConnection methods can be called on the
+     * pooled Connection.
+     */
+    public void testPGConnection()
+    {
+        try
+        {
+            con = getDataSourceConnection();
+            ((PGConnection)con).getEncoding().name();
+            con.close();
+        }
+        catch (Exception e)
+        {
+            fail("Unable to call PGConnection method on pooled connection due to "+e.getClass().getName()+" ("+e.getMessage()+")");
+        }
+    }
+
     /**
      * Uses the mini-JNDI implementation for testing purposes
      */

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`import java.sql.*;`
`5`	`5`	`import java.util.*;`
`6`	`6`	`import java.lang.reflect.*;`
	`7`	`+import org.postgresql.PGConnection;`
`7`	`8`
`8`	`9`	`/**`
`9`	`10`	`* PostgreSQL implementation of the PooledConnection interface. This shouldn't`
`@@ -12,7 +13,7 @@`
`12`	`13`	`* @see ConnectionPool`
`13`	`14`	`*`
`14`	`15`	`* @author Aaron Mulder (ammulder@chariotsolutions.com)`
`15`		`- * @version $Revision: 1.5 $`
	`16`	`+ * @version $Revision: 1.6 $`
`16`	`17`	`*/`
`17`	`18`	`public class PooledConnectionImpl implements PooledConnection`
`18`	`19`	`{`
`@@ -114,7 +115,7 @@ public Connection getConnection() throws SQLException`
`114`	`115`	`con.setAutoCommit(autoCommit);`
`115`	`116`	`ConnectionHandler handler = new ConnectionHandler(con);`
`116`	`117`	`last = handler;`
`117`		`- Connection con = (Connection)Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{Connection.class}, handler);`
	`118`	`+ Connection con = (Connection)Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{Connection.class, PGConnection.class}, handler);`
`118`	`119`	`last.setProxy(con);`
`119`	`120`	`return con;`
`120`	`121`	`}`
`@@ -213,7 +214,7 @@ public Object invoke(Object proxy, Method method, Object[] args)`
`213`	`214`	`throw e.getTargetException();`
`214`	`215`	`}`
`215`	`216`	`}`
`216`		`- // All the rest is from the Connection interface`
	`217`	`+ // All the rest is from the Connection or PGConnection interface`
`217`	`218`	`if (method.getName().equals("isClosed"))`
`218`	`219`	`{`
`219`	`220`	`return con == null ? Boolean.TRUE : Boolean.FALSE;`