This patch fixes a bug introduced in the jdbc bytea support patch.

That patch broke the ability to read data from binary cursors.
--Barry Lind
 Modified Files:
 	pgsql/src/interfaces/jdbc/org/postgresql/Connection.java
 	pgsql/src/interfaces/jdbc/org/postgresql/ResultSet.java
 	pgsql/src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
 	pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Connection.java
 	pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/ResultSet.java
 	pgsql/src/interfaces/jdbc/org/postgresql/jdbc2/Connection.java
 	pgsql/src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java
 	pgsql/src/interfaces/jdbc/org/postgresql/jdbc2/UpdateableResultSet.java

1 files changed, 8 insertions, 6 deletions

diff --git a/src/interfaces/jdbc/org/postgresql/ResultSet.java b/src/interfaces/jdbc/org/postgresql/ResultSet.java
index 8757d21c7ec..3274b1eb38c 100644
--- a/src/interfaces/jdbc/org/postgresql/ResultSet.java
+++ b/src/interfaces/jdbc/org/postgresql/ResultSet.java
@@ -18,6 +18,7 @@ public abstract class ResultSet
   protected Vector rows;			// The results
   protected Field fields[];		// The field descriptions
   protected String status;		// Status of the result
+  protected boolean binaryCursor = false; // is the data binary or Strings
   protected int updateCount;		// How many rows did we get back?
   protected int insertOID;		// The oid of an inserted row
   protected int current_row;		// Our pointer to where we are at
@@ -41,7 +42,7 @@ public abstract class ResultSet
    * @param updateCount the number of rows affected by the operation
    * @param cursor the positioned update/delete cursor name
    */
-  public ResultSet(Connection conn, Field[] fields, Vector tuples, String status, int updateCount,int insertOID)
+  public ResultSet(Connection conn, Field[] fields, Vector tuples, String status, int updateCount,int insertOID, boolean binaryCursor)
   {
     this.connection = conn;
     this.fields = fields;
@@ -51,6 +52,7 @@ public abstract class ResultSet
     this.insertOID = insertOID;
     this.this_row = null;
     this.current_row = -1;
+    this.binaryCursor = binaryCursor;
   }
 
 
@@ -65,10 +67,10 @@ public abstract class ResultSet
    * @param updateCount the number of rows affected by the operation
    * @param cursor the positioned update/delete cursor name
    */
-  public ResultSet(Connection conn, Field[] fields, Vector tuples, String status, int updateCount)
-  {
-      this(conn,fields,tuples,status,updateCount,0);
-  }
+   public ResultSet(Connection conn, Field[] fields, Vector tuples, String status, int updateCount)
+   {
+       this(conn,fields,tuples,status,updateCount,0,false);
+   }
 
   /**
    * We at times need to know if the resultSet we are working
@@ -172,7 +174,7 @@ public abstract class ResultSet
      */
     public int getInsertedOID()
     {
-	return insertOID;
+        return insertOID;
     }
 
     /**