rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Patch from Aaron Mulder to have pooled connections implement PGConnection 

Modified Files:
 	jdbc/org/postgresql/jdbc2/optional/PooledConnectionImpl.java
 	jdbc/org/postgresql/test/jdbc2/optional/BaseDataSourceTest.java
This commit is contained in:
Barry Lind 2003-01-14 05:46:49 +00:00
parent 88e524063a
commit 9db065ba56
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/interfaces/jdbc/org/postgresql/jdbc2/optional/PooledConnectionImpl.java
View File

@ -4,6 +4,7 @@ import javax.sql.*;
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 @@ import java.lang.reflect.*;
* @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 class PooledConnectionImpl implements PooledConnection
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 class PooledConnectionImpl implements PooledConnection
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;

21
src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/BaseDataSourceTest.java
View File

@ -3,6 +3,7 @@ package org.postgresql.test.jdbc2.optional;
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 @@ import javax.naming.*;
* 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 abstract class BaseDataSourceTest extends TestCase
}
}
/**
* 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
*/