From: Peter T Mount <peter@retep.org.uk>

This implements some of the JDBC2 methods, fixes a bug introduced into the
JDBC1 portion of the driver, and introduces a new example, showing how to
use the CORBA ORB thats in Java2 with JDBC.

The Tar file contains the new files, the diff the changes to the others.
CHANGELOG is separate as I forgot to make a .orig ;-)

2 files changed, 26 insertions, 7 deletions

diff --git a/src/interfaces/jdbc/postgresql/jdbc1/ResultSetMetaData.java b/src/interfaces/jdbc/postgresql/jdbc1/ResultSetMetaData.java
index 95492e81b91..25878dd8c88 100644
--- a/src/interfaces/jdbc/postgresql/jdbc1/ResultSetMetaData.java
+++ b/src/interfaces/jdbc/postgresql/jdbc1/ResultSetMetaData.java
@@ -6,10 +6,15 @@ package postgresql.jdbc1;
 // postgresql.jdbc2 package.
 
 import java.lang.*;
-import java.sql.*;
 import java.util.*;
 import postgresql.*;
 
+// We explicitly import classes here as the original line:
+//import java.sql.*;
+// causes javac to get confused.
+import java.sql.SQLException;
+import java.sql.Types;
+
 /**
  * A ResultSetMetaData object can be used to find out about the types and
  * properties of the columns in a ResultSet
diff --git a/src/interfaces/jdbc/postgresql/jdbc2/ResultSet.java b/src/interfaces/jdbc/postgresql/jdbc2/ResultSet.java
index 9790dac4aa8..54e1081a8e2 100644
--- a/src/interfaces/jdbc/postgresql/jdbc2/ResultSet.java
+++ b/src/interfaces/jdbc/postgresql/jdbc2/ResultSet.java
@@ -789,9 +789,12 @@ public class ResultSet extends postgresql.ResultSet implements java.sql.ResultSe
     
     // ** JDBC 2 Extensions **
     
-    public boolean absolute(int row) throws SQLException
+    public boolean absolute(int index) throws SQLException
     {
-	throw postgresql.Driver.notImplemented();
+	if (index < 0 || index > rows.size())
+	    return false;
+	this_row = (byte [][])rows.elementAt(index);
+	return true;
     }
     
     public void afterLast() throws SQLException
@@ -816,7 +819,11 @@ public class ResultSet extends postgresql.ResultSet implements java.sql.ResultSe
     
     public boolean first() throws SQLException
     {
-	throw postgresql.Driver.notImplemented();
+	if (rows.size() <= 0)
+	    return false;
+	current_row = 0;
+	this_row = (byte [][])rows.elementAt(current_row);
+	return true;
     }
     
     public Array getArray(String colName) throws SQLException
@@ -941,7 +948,7 @@ public class ResultSet extends postgresql.ResultSet implements java.sql.ResultSe
     
     public int getRow() throws SQLException
     {
-	throw postgresql.Driver.notImplemented();
+	return current_row;
     }
     
     // This one needs some thought, as not all ResultSets come from a statement
@@ -982,7 +989,11 @@ public class ResultSet extends postgresql.ResultSet implements java.sql.ResultSe
     
     public boolean last() throws SQLException
     {
-	throw postgresql.Driver.notImplemented();
+	if (rows.size() <= 0)
+	    return false;
+	current_row = rows.size() - 1;
+	this_row = (byte [][])rows.elementAt(current_row);
+	return true;
     }
     
     public void moveToCurrentRow() throws SQLException
@@ -997,7 +1008,10 @@ public class ResultSet extends postgresql.ResultSet implements java.sql.ResultSe
     
     public boolean previous() throws SQLException
     {
-	throw postgresql.Driver.notImplemented();
+	if (--current_row < 0)
+	    return false;
+	this_row = (byte [][])rows.elementAt(current_row);
+	return true;
     }
     
     public void refreshRow() throws SQLException