diff options
| author | Peter Mount <peter@retep.org.uk> | 2001-01-19 08:49:06 +0000 |
|---|---|---|
| committer | Peter Mount <peter@retep.org.uk> | 2001-01-19 08:49:06 +0000 |
| commit | be281916f976489cc8d531e7b7c3213b0174c160 (patch) | |
| tree | f1f3aec04fc6f62929320ee455c851433c08eaf5 | |
| parent | 8fe8fc9db092fd28449058402658bfec97ac2881 (diff) | |
Fri Jan 19 08:47:00 GMT 2001 peter@retep.org.uk
- Applied patch submitted by John Schutz <schutz@austin.rr.com> that
fixed a bug with ANT's SQL functions (not needed for building but nice
to have fixed).
| -rw-r--r-- | src/interfaces/jdbc/CHANGELOG | 5 | ||||
| -rw-r--r-- | src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java | 4 | ||||
| -rw-r--r-- | src/interfaces/jdbc/org/postgresql/jdbc2/Statement.java | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/interfaces/jdbc/CHANGELOG b/src/interfaces/jdbc/CHANGELOG index 854725066c4..1830794daf2 100644 --- a/src/interfaces/jdbc/CHANGELOG +++ b/src/interfaces/jdbc/CHANGELOG @@ -1,3 +1,8 @@ +Fri Jan 19 08:47:00 GMT 2001 peter@retep.org.uk + - Applied patch submitted by John Schutz <schutz@austin.rr.com> that + fixed a bug with ANT's SQL functions (not needed for building but nice + to have fixed). + Thu Jan 18 17:30:00 GMT 2001 peter@retep.org.uk - Added new error message into errors.properties "postgresql.notsensitive" This is used by jdbc2.ResultSet when a method is called that should diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java b/src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java index fcc6dac360e..f20bc997fd5 100644 --- a/src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java +++ b/src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java @@ -281,7 +281,9 @@ public class Statement implements java.sql.Statement */ public java.sql.ResultSet getResultSet() throws SQLException { - return result; + if (result != null) && ((org.postgresql.ResultSet)result.reallyResultSet()) + return result; + return null; } /** diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/Statement.java b/src/interfaces/jdbc/org/postgresql/jdbc2/Statement.java index 5a8f98bd29d..04315c096a1 100644 --- a/src/interfaces/jdbc/org/postgresql/jdbc2/Statement.java +++ b/src/interfaces/jdbc/org/postgresql/jdbc2/Statement.java @@ -291,7 +291,9 @@ public class Statement implements java.sql.Statement */ public java.sql.ResultSet getResultSet() throws SQLException { - return result; + if (result != null && ((org.postgresql.ResultSet)result).reallyResultSet()) + return result; + return null; } /** |