Skip to content

Fix ArrayResultSet after-last cursor state #3142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fallintoplace wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −4
Open

Fix ArrayResultSet after-last cursor state #3142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@

### Bug Fixes

- **[jdbc-v2]** Fixed `ArrayResultSet#next()` leaving the cursor before-first for empty arrays or on the last row for
non-empty arrays after exhaustion. The cursor now moves to the after-last state when `next()` returns `false`.
- **[jdbc-v2]** Added the non-reserved keywords `AGGREGATE`, `BOUNDED`, `EXTEND`, `HANDLER`, `IDLE`, `PROTOCOL`,
`RECENT`, `TIMEOUT` and `UNORDERED` (ClickHouse `26.8+`; `IDLE`, `TIMEOUT` and `RECENT` come from the multi-word
keywords `IDLE TIMEOUT` and `RECENT SAMPLES`) to the list of keywords allowed in identifier positions. The server
Expand Down
5 changes: 3 additions & 2 deletions jdbc-v2/src/main/java/com/clickhouse/jdbc/types/ArrayResultSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ private static ClickHouseColumn elementColumn(ClickHouseColumn column) {

@Override
public boolean next() throws SQLException {
if (pos + 1 >= length || length == 0) {
if (pos + 1 >= length) {
pos = length;
return false;
}
pos++;
Expand Down Expand Up @@ -478,7 +479,7 @@ public boolean isAfterLast() throws SQLException {

@Override
public boolean isFirst() throws SQLException {
return pos == 0;
return length > 0 && pos == 0;
}

@Override
Expand Down
12 changes: 10 additions & 2 deletions jdbc-v2/src/test/java/com/clickhouse/jdbc/types/ArrayResultSetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,10 +308,11 @@ void testEmptyArray() throws SQLException {

assertFalse(rs.next());

Assert.assertTrue(rs.isBeforeFirst());
Assert.assertFalse(rs.isAfterLast());
Assert.assertFalse(rs.isBeforeFirst());
Assert.assertTrue(rs.isAfterLast());
Assert.assertFalse(rs.isLast());
Assert.assertFalse(rs.isFirst());
Assert.assertEquals(rs.getRow(), 0);

Assert.assertThrows(SQLException.class, () -> rs.getString("col1"));
Assert.assertThrows(SQLException.class, () -> rs.getObject("col1"));
Expand Down Expand Up @@ -573,7 +574,9 @@ void testNextEmptyArray() throws SQLException {
ArrayResultSet rs = new ArrayResultSet(array, ClickHouseColumn.parse("v Array(Int32)").get(0));

assertFalse(rs.next(), "next() should return false immediately for an empty array");
assertTrue(rs.isAfterLast(), "next() should move an empty array after-last");
assertFalse(rs.next(), "next() should keep returning false on subsequent calls");
assertTrue(rs.isAfterLast(), "next() should keep the cursor after-last");
}

@Test
Expand All @@ -584,6 +587,11 @@ void testNextSingleElement() throws SQLException {
assertTrue(rs.next());
assertEquals(rs.getInt(2), 42);
assertFalse(rs.next(), "next() should return false after the only element");
assertTrue(rs.isAfterLast());
assertFalse(rs.isLast());
assertEquals(rs.getRow(), 0);
assertTrue(rs.previous());
assertEquals(rs.getInt(2), 42);
}

@Test
Expand Down
Loading