From 234599e943dbe0d3c9a31608d208ab496b011638 Mon Sep 17 00:00:00 2001 From: Peter Mount Date: Wed, 31 Jan 2001 09:23:45 +0000 Subject: [PATCH] Wed Jan 31 08:46:00 GMT 2001 peter@retep.org.uk - Some minor additions to Statement to make our own extensions more portable. - Statement.close() will now call ResultSet.close() rather than just dissasociating with it. --- src/interfaces/jdbc/CHANGELOG | 6 +++ src/interfaces/jdbc/example/basic.java | 4 +- src/interfaces/jdbc/jdbc.jpx | 2 +- .../jdbc/org/postgresql/Statement.java | 42 +++++++++++++++++++ .../jdbc/org/postgresql/jdbc1/Statement.java | 22 +++++++++- .../jdbc/org/postgresql/jdbc2/Statement.java | 10 ++++- 6 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 src/interfaces/jdbc/org/postgresql/Statement.java diff --git a/src/interfaces/jdbc/CHANGELOG b/src/interfaces/jdbc/CHANGELOG index ffc0ce9efb..bbf3952f1a 100644 --- a/src/interfaces/jdbc/CHANGELOG +++ b/src/interfaces/jdbc/CHANGELOG @@ -1,3 +1,9 @@ +Wed Jan 31 08:46:00 GMT 2001 peter@retep.org.uk + - Some minor additions to Statement to make our own extensions more + portable. + - Statement.close() will now call ResultSet.close() rather than just + dissasociating with it. + Tue Jan 30 22:24:00 GMT 2001 peter@retep.org.uk - Fixed bug where Statement.setMaxRows() was a global setting. Now limited to just itself. diff --git a/src/interfaces/jdbc/example/basic.java b/src/interfaces/jdbc/example/basic.java index 5e38253874..2c989b4c89 100644 --- a/src/interfaces/jdbc/example/basic.java +++ b/src/interfaces/jdbc/example/basic.java @@ -6,7 +6,7 @@ import java.text.*; /** * - * $Id: basic.java,v 1.6 2001/01/31 08:26:01 peter Exp $ + * $Id: basic.java,v 1.7 2001/01/31 09:23:45 peter Exp $ * * This example tests the basic components of the JDBC driver, and shows * how even the simplest of queries can be implemented. @@ -86,7 +86,7 @@ public class basic // This shows how to get the oid of a just inserted row // updated for 7.1 st.executeUpdate("insert into basic values (4,1)"); - int insertedOID = ((org.postgresql.jdbc2.Statement)st).getInsertedOID(); + int insertedOID = ((org.postgresql.Statement)st).getInsertedOID(); System.out.println("Inserted row with oid "+insertedOID); // Now change the value of b from 1 to 8 diff --git a/src/interfaces/jdbc/jdbc.jpx b/src/interfaces/jdbc/jdbc.jpx index 2f8a779a6e..19fb6df534 100644 --- a/src/interfaces/jdbc/jdbc.jpx +++ b/src/interfaces/jdbc/jdbc.jpx @@ -9,7 +9,7 @@ - + diff --git a/src/interfaces/jdbc/org/postgresql/Statement.java b/src/interfaces/jdbc/org/postgresql/Statement.java new file mode 100644 index 0000000000..105bc81f2b --- /dev/null +++ b/src/interfaces/jdbc/org/postgresql/Statement.java @@ -0,0 +1,42 @@ +package org.postgresql; + +import java.sql.SQLException; + +/** + * This class defines methods implemented by the two subclasses + * org.postgresql.jdbc1.Statement and org.postgresql.jdbc2.Statement that are + * unique to PostgreSQL's JDBC driver. + * + *

They are defined so that client code can cast to org.postgresql.Statement + * without having to predetermine the jdbc driver type. + * + *

ie: Before this class existed, you had to use: + * + *

((org.postgresql.jdbc2.Statement)stat).getInsertedOID(); + * + *

now you use: + * + *

((org.postgresql.Statement)stat).getInsertedOID(); + * + *

As you can see, this is independent of JDBC1.2, JDBC2.0 or the upcoming + * JDBC3. + */ + +public abstract class Statement { + + public Statement() { + } + + /** + * Returns the status message from the current Result.

+ * This is used internally by the driver. + * + * @return status message from backend + */ + public abstract String getResultStatusString(); + + /** + * @return the OID of the last row inserted + */ + public abstract int getInsertedOID() throws SQLException; +} \ No newline at end of file diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java b/src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java index a4835a72ac..2dc617b265 100644 --- a/src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java +++ b/src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java @@ -90,7 +90,13 @@ public class Statement implements java.sql.Statement */ public void close() throws SQLException { - result = null; + // Force the ResultSet to close + java.sql.ResultSet rs = getResultSet(); + if(rs!=null) + rs.close(); + + // Disasociate it from us (For Garbage Collection) + result = null; } /** @@ -327,4 +333,18 @@ public class Statement implements java.sql.Statement return null; return ((org.postgresql.ResultSet)result).getStatusString(); } + + /** + * New in 7.1: Returns the Last inserted oid. This should be used, rather + * than the old method using getResultSet, which for executeUpdate returns + * null. + * @return OID of last insert + */ + public int getInsertedOID() throws SQLException + { + if(result!=null) + return ((org.postgresql.ResultSet)result).getInsertedOID(); + return 0; + } + } diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/Statement.java b/src/interfaces/jdbc/org/postgresql/jdbc2/Statement.java index a0a40c1469..ec8632a574 100644 --- a/src/interfaces/jdbc/org/postgresql/jdbc2/Statement.java +++ b/src/interfaces/jdbc/org/postgresql/jdbc2/Statement.java @@ -22,7 +22,7 @@ import org.postgresql.util.*; * @see java.sql.Statement * @see ResultSet */ -public class Statement implements java.sql.Statement +public class Statement extends org.postgresql.Statement implements java.sql.Statement { Connection connection; // The connection who created us java.sql.ResultSet result = null; // The current results @@ -95,7 +95,13 @@ public class Statement implements java.sql.Statement */ public void close() throws SQLException { - result = null; + // Force the ResultSet to close + java.sql.ResultSet rs = getResultSet(); + if(rs!=null) + rs.close(); + + // Disasociate it from us (For Garbage Collection) + result = null; } /**