postgrespro
diff --git a/‎src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
Lines changed: 2 additions & 3 deletions b/‎src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
Lines changed: 2 additions & 3 deletions
diff --git a/‎src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java
Lines changed: 7 additions & 6 deletions b/‎src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java
Lines changed: 7 additions & 6 deletions
@@ -13,7 +13,7 @@
 import org.postgresql.util.*;
 
 
-/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Connection.java,v 1.1 2002/07/23 03:59:55 barry Exp $
+/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Connection.java,v 1.2 2002/07/25 22:45:27 barry Exp $
  * This class defines methods of the jdbc1 specification.  This class is
  * extended by org.postgresql.jdbc2.AbstractJdbc2Connection which adds the jdbc2
  * methods.  The real Connection class (for jdbc1) is org.postgresql.jdbc1.Jdbc1Connection
@@ -359,8 +359,7 @@ public org.postgresql.Driver getDriver()
         // are common to all implementations (JDBC1 or 2), they are placed here.
         // This should make it easy to maintain the two specifications.
 
-//BJL TODO this method shouldn't need to take a Connection since this can be used.
-        public abstract java.sql.ResultSet getResultSet(java.sql.Statement stat, org.postgresql.Field[] fields, Vector tuples, String status, int updateCount, long insertOID, boolean binaryCursor) throws SQLException;
+        public abstract java.sql.ResultSet getResultSet(Statement statement, org.postgresql.Field[] fields, Vector tuples, String status, int updateCount, long insertOID, boolean binaryCursor) throws SQLException;
 
         /*
          * This adds a warning to the warning chain.
 
@@ -13,15 +13,15 @@
 import org.postgresql.util.PGbytea;
 import org.postgresql.util.PSQLException;
 
-/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1ResultSet.java,v 1.1 2002/07/23 03:59:55 barry Exp $
+/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1ResultSet.java,v 1.2 2002/07/25 22:45:27 barry Exp $
  * This class defines methods of the jdbc1 specification.  This class is
  * extended by org.postgresql.jdbc2.AbstractJdbc2ResultSet which adds the jdbc2
  * methods.  The real ResultSet class (for jdbc1) is org.postgresql.jdbc1.Jdbc1ResultSet
  */
 public abstract class AbstractJdbc1ResultSet
 {
-
 	protected Vector rows;			// The results
+        protected Statement statement;
 	protected Field fields[];		// The field descriptions
 	protected String status;		// Status of the result
 	protected boolean binaryCursor = false; // is the data binary or Strings
@@ -33,17 +33,18 @@ public abstract class AbstractJdbc1ResultSet
 	protected SQLWarning warnings = null;	// The warning chain
 	protected boolean wasNullFlag = false;	// the flag for wasNull()
 
-	//	We can chain multiple resultSets together - this points to
+	// We can chain multiple resultSets together - this points to
 	// next resultSet in the chain.
 	protected ResultSet next = null;
 
 	protected StringBuffer sbuf = null;
 	public byte[][] rowBuffer=null;
 
 
-	public AbstractJdbc1ResultSet(org.postgresql.PGConnection conn, Field[] fields, Vector tuples, String status, int updateCount, long insertOID, boolean binaryCursor)
+	public AbstractJdbc1ResultSet(org.postgresql.PGConnection conn, Statement statement, Field[] fields, Vector tuples, String status, int updateCount, long insertOID, boolean binaryCursor)
 	{
 		this.connection = conn;
+                this.statement = statement;
 		this.fields = fields;
 		this.rows = tuples;
 		this.status = status;
@@ -116,7 +117,7 @@ public byte getByte(int columnIndex) throws SQLException
 				throw new PSQLException("postgresql.res.badbyte", s);
 			}
 		}
-		return 0;		// SQL NULL
+		return 0; // SQL NULL
 	}
 
 	public short getShort(int columnIndex) throws SQLException
@@ -134,7 +135,7 @@ public short getShort(int columnIndex) throws SQLException
 				throw new PSQLException("postgresql.res.badshort", s);
 			}
 		}
-		return 0;		// SQL NULL
+		return 0; // SQL NULL
 	}
 
 	public int getInt(int columnIndex) throws SQLException