Fix the off by one errors in ResultSet from 6.5.3, and more.

bmomjian · bmomjian · commit 2cfb14e8ea89 · 2000-05-12T20:54:22.000Z
I'm including a diff of
postgresql-7.0/src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java.
I've clearly marked all the fixes I did. Would *someone* who has access
to the cvs please put this in?

Joseph Shraibman
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java b/src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java
@@ -797,12 +797,14 @@ public boolean absolute(int index) throws SQLException
     
     public void afterLast() throws SQLException
     {
-	current_row = rows.size() + 1;
+	if (rows.size() > 0)
+		current_row = rows.size();
     }
     
     public void beforeFirst() throws SQLException
     {
-	current_row = 0;
+	if (rows.size() > 0)
+		current_row = -1;
     }
     
     public void cancelRowUpdates() throws SQLException
@@ -946,7 +948,7 @@ public Ref getRef(int i) throws SQLException
     
     public int getRow() throws SQLException
     {
-	return current_row;
+	return current_row + 1;
     }
     
     // This one needs some thought, as not all ResultSets come from a statement
@@ -967,24 +969,24 @@ public void insertRow() throws SQLException
     
     public boolean isAfterLast() throws SQLException
     {
-	throw org.postgresql.Driver.notImplemented();
+	return (current_row >= rows.size()  && rows.size() > 0);
     }
-    
+
     public boolean isBeforeFirst() throws SQLException
     {
-	throw org.postgresql.Driver.notImplemented();
+	return (current_row < 0 && rows.size() > 0);
     }
-    
+
     public boolean isFirst() throws SQLException
     {
-	throw org.postgresql.Driver.notImplemented();
+	return (current_row == 0 && rows.size() >= 0);
     }
-    
+
     public boolean isLast() throws SQLException
     {
-	throw org.postgresql.Driver.notImplemented();
+	return (current_row == rows.size() -1  && rows.size() > 0);
     }
-    
+
     public boolean last() throws SQLException
     {
 	if (rows.size() <= 0)

Original file line number	Diff line number	Diff line change
`@@ -797,12 +797,14 @@ public boolean absolute(int index) throws SQLException`
`797`	`797`
`798`	`798`	`public void afterLast() throws SQLException`
`799`	`799`	`{`
`800`		`- current_row = rows.size() + 1;`
	`800`	`+ if (rows.size() > 0)`
	`801`	`+ current_row = rows.size();`
`801`	`802`	`}`
`802`	`803`
`803`	`804`	`public void beforeFirst() throws SQLException`
`804`	`805`	`{`
`805`		`- current_row = 0;`
	`806`	`+ if (rows.size() > 0)`
	`807`	`+ current_row = -1;`
`806`	`808`	`}`
`807`	`809`
`808`	`810`	`public void cancelRowUpdates() throws SQLException`
`@@ -946,7 +948,7 @@ public Ref getRef(int i) throws SQLException`
`946`	`948`
`947`	`949`	`public int getRow() throws SQLException`
`948`	`950`	`{`
`949`		`- return current_row;`
	`951`	`+ return current_row + 1;`
`950`	`952`	`}`
`951`	`953`
`952`	`954`	`// This one needs some thought, as not all ResultSets come from a statement`
`@@ -967,24 +969,24 @@ public void insertRow() throws SQLException`
`967`	`969`
`968`	`970`	`public boolean isAfterLast() throws SQLException`
`969`	`971`	`{`
`970`		`- throw org.postgresql.Driver.notImplemented();`
	`972`	`+ return (current_row >= rows.size() && rows.size() > 0);`
`971`	`973`	`}`
`972`		`-`
	`974`	`+`
`973`	`975`	`public boolean isBeforeFirst() throws SQLException`
`974`	`976`	`{`
`975`		`- throw org.postgresql.Driver.notImplemented();`
	`977`	`+ return (current_row < 0 && rows.size() > 0);`
`976`	`978`	`}`
`977`		`-`
	`979`	`+`
`978`	`980`	`public boolean isFirst() throws SQLException`
`979`	`981`	`{`
`980`		`- throw org.postgresql.Driver.notImplemented();`
	`982`	`+ return (current_row == 0 && rows.size() >= 0);`
`981`	`983`	`}`
`982`		`-`
	`984`	`+`
`983`	`985`	`public boolean isLast() throws SQLException`
`984`	`986`	`{`
`985`		`- throw org.postgresql.Driver.notImplemented();`
	`987`	`+ return (current_row == rows.size() -1 && rows.size() > 0);`
`986`	`988`	`}`
`987`		`-`
	`989`	`+`
`988`	`990`	`public boolean last() throws SQLException`
`989`	`991`	`{`
`990`	`992`	`if (rows.size() <= 0)`