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).

diff --git a/src/interfaces/jdbc/CHANGELOG b/src/interfaces/jdbc/CHANGELOG
index 854725066c45743b8baccdefa4d49e5b87b843c4..1830794daf25caa0e961c65b6c1dabad1e85f292 100644 (file)
--- 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 fcc6dac360e712e7a80de1ed98bdc644aa8ae88b..f20bc997fd5784974e9a6c1799e77f06a354942d 100644 (file)
--- 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 5a8f98bd29dd7773d07659faa7b87a1b51da206a..04315c096a16206ca027f0f71b34f0e1cf8879d0 100644 (file)
--- 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;
        }
 
        /**