Fri Jan 19 08:47:00 GMT 2001 peter@retep.org.uk

Peter Mount · Peter Mount · commit be281916f976 · 2001-01-19T08:49:06.000Z
- Applied patch submitted by John Schutz &lt;schutz@austin.rr.com&gt; 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
@@ -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
@@ -281,7 +281,9 @@ public boolean execute(String sql) throws SQLException
 	 */
 	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
@@ -291,7 +291,9 @@ public boolean execute(String sql) throws SQLException
 	 */
 	public java.sql.ResultSet getResultSet() throws SQLException
 	{
-		return result;
+          if (result != null && ((org.postgresql.ResultSet)result).reallyResultSet())
+            return result;
+          return null;
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,9 @@ public boolean execute(String sql) throws SQLException`
`281`	`281`	`*/`
`282`	`282`	`public java.sql.ResultSet getResultSet() throws SQLException`
`283`	`283`	`{`
`284`		`- return result;`
	`284`	`+ if (result != null) && ((org.postgresql.ResultSet)result.reallyResultSet())`
	`285`	`+ return result;`
	`286`	`+ return null;`
`285`	`287`	`}`
`286`	`288`
`287`	`289`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,9 @@ public boolean execute(String sql) throws SQLException`
`291`	`291`	`*/`
`292`	`292`	`public java.sql.ResultSet getResultSet() throws SQLException`
`293`	`293`	`{`
`294`		`- return result;`
	`294`	`+ if (result != null && ((org.postgresql.ResultSet)result).reallyResultSet())`
	`295`	`+ return result;`
	`296`	`+ return null;`
`295`	`297`	`}`
`296`	`298`
`297`	`299`	`/**`