mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-30 16:31:22 +02:00
Great, here is a context diff of CVS for implementing the get/setCatalog methods
in Connection - note: I've updated setCatalog(String catalog) from my previous diff so it checks whether it is already connected to the specified catalog. Jason Davies
This commit is contained in:
parent
ff21a8e5c8
commit
eec08cddb4
@ -11,7 +11,7 @@ import org.postgresql.util.*;
|
|||||||
import org.postgresql.core.Encoding;
|
import org.postgresql.core.Encoding;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* $Id: Connection.java,v 1.19 2001/07/21 18:52:10 momjian Exp $
|
* $Id: Connection.java,v 1.20 2001/07/21 18:56:17 momjian Exp $
|
||||||
*
|
*
|
||||||
* This abstract class is used by org.postgresql.Driver to open either the JDBC1 or
|
* This abstract class is used by org.postgresql.Driver to open either the JDBC1 or
|
||||||
* JDBC2 versions of the Connection class.
|
* JDBC2 versions of the Connection class.
|
||||||
@ -790,6 +790,36 @@ public abstract class Connection
|
|||||||
|
|
||||||
public abstract void close() throws SQLException;
|
public abstract void close() throws SQLException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A sub-space of this Connection's database may be selected by
|
||||||
|
* setting a catalog name. If the driver does not support catalogs,
|
||||||
|
* it will silently ignore this request
|
||||||
|
*
|
||||||
|
* @exception SQLException if a database access error occurs
|
||||||
|
*/
|
||||||
|
public void setCatalog(String catalog) throws SQLException
|
||||||
|
{
|
||||||
|
if(catalog!=null && !catalog.equals(PG_DATABASE)) {
|
||||||
|
close();
|
||||||
|
Properties info=new Properties();
|
||||||
|
info.setProperty("user", PG_USER);
|
||||||
|
info.setProperty("password", PG_PASSWORD);
|
||||||
|
openConnection(PG_HOST, PG_PORT, info, catalog, this_url, this_driver);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the connections current catalog name, or null if no
|
||||||
|
* catalog name is set, or we dont support catalogs.
|
||||||
|
*
|
||||||
|
* @return the current catalog name or null
|
||||||
|
* @exception SQLException if a database access error occurs
|
||||||
|
*/
|
||||||
|
public String getCatalog() throws SQLException
|
||||||
|
{
|
||||||
|
return PG_DATABASE;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Overides finalize(). If called, it closes the connection.
|
* Overides finalize(). If called, it closes the connection.
|
||||||
*
|
*
|
||||||
|
@ -17,7 +17,7 @@ import org.postgresql.largeobject.*;
|
|||||||
import org.postgresql.util.*;
|
import org.postgresql.util.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* $Id: Connection.java,v 1.5 2001/01/18 17:37:13 peter Exp $
|
* $Id: Connection.java,v 1.6 2001/07/21 18:56:17 momjian Exp $
|
||||||
*
|
*
|
||||||
* A Connection represents a session with a specific database. Within the
|
* A Connection represents a session with a specific database. Within the
|
||||||
* context of a Connection, SQL statements are executed and results are
|
* context of a Connection, SQL statements are executed and results are
|
||||||
@ -272,30 +272,6 @@ public class Connection extends org.postgresql.Connection implements java.sql.Co
|
|||||||
return readOnly;
|
return readOnly;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* A sub-space of this Connection's database may be selected by
|
|
||||||
* setting a catalog name. If the driver does not support catalogs,
|
|
||||||
* it will silently ignore this request
|
|
||||||
*
|
|
||||||
* @exception SQLException if a database access error occurs
|
|
||||||
*/
|
|
||||||
public void setCatalog(String catalog) throws SQLException
|
|
||||||
{
|
|
||||||
// No-op
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return the connections current catalog name, or null if no
|
|
||||||
* catalog name is set, or we dont support catalogs.
|
|
||||||
*
|
|
||||||
* @return the current catalog name or null
|
|
||||||
* @exception SQLException if a database access error occurs
|
|
||||||
*/
|
|
||||||
public String getCatalog() throws SQLException
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* You can call this method to try to change the transaction
|
* You can call this method to try to change the transaction
|
||||||
* isolation level using one of the TRANSACTION_* values.
|
* isolation level using one of the TRANSACTION_* values.
|
||||||
|
@ -17,7 +17,7 @@ import org.postgresql.largeobject.*;
|
|||||||
import org.postgresql.util.*;
|
import org.postgresql.util.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* $Id: Connection.java,v 1.7 2001/02/13 16:39:02 peter Exp $
|
* $Id: Connection.java,v 1.8 2001/07/21 18:56:17 momjian Exp $
|
||||||
*
|
*
|
||||||
* A Connection represents a session with a specific database. Within the
|
* A Connection represents a session with a specific database. Within the
|
||||||
* context of a Connection, SQL statements are executed and results are
|
* context of a Connection, SQL statements are executed and results are
|
||||||
@ -355,30 +355,6 @@ public class Connection extends org.postgresql.Connection implements java.sql.Co
|
|||||||
return readOnly;
|
return readOnly;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* A sub-space of this Connection's database may be selected by
|
|
||||||
* setting a catalog name. If the driver does not support catalogs,
|
|
||||||
* it will silently ignore this request
|
|
||||||
*
|
|
||||||
* @exception SQLException if a database access error occurs
|
|
||||||
*/
|
|
||||||
public void setCatalog(String catalog) throws SQLException
|
|
||||||
{
|
|
||||||
// No-op
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return the connections current catalog name, or null if no
|
|
||||||
* catalog name is set, or we dont support catalogs.
|
|
||||||
*
|
|
||||||
* @return the current catalog name or null
|
|
||||||
* @exception SQLException if a database access error occurs
|
|
||||||
*/
|
|
||||||
public String getCatalog() throws SQLException
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* You can call this method to try to change the transaction
|
* You can call this method to try to change the transaction
|
||||||
* isolation level using one of the TRANSACTION_* values.
|
* isolation level using one of the TRANSACTION_* values.
|
||||||
|
Loading…
Reference in New Issue
Block a user