Skip to content

Auto-close result returned from getResultSet (1.5) #783

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

Merged
staticlibs merged 1 commit into from
Aug 3, 2026
Merged

Auto-close result returned from getResultSet (1.5) #783

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
10 changes: 6 additions & 4 deletions src/main/java/org/duckdb/DuckDBPreparedStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public class DuckDBPreparedStatement implements PreparedStatement {
volatile boolean closeOnCompletion = false;

private DuckDBResultSet selectResult = null;
private boolean selectResultReturned = false;
private long updateResult = 0;

private DuckDBChunkedResult chunkedResult = null;
Expand Down Expand Up @@ -231,6 +232,7 @@ public boolean execute() throws SQLException {
cleanupCancelQueryTask();
DuckDBResultSetMetaData resultMeta = DuckDBNative.duckdb_jdbc_query_result_meta(resultRef);
selectResult = new DuckDBResultSet(conn, this, resultMeta, resultRef);
selectResultReturned = false;
returnsResultSet = resultMeta.return_type.equals(QUERY_RESULT);
returnsChangedRows = resultMeta.return_type.equals(CHANGED_ROWS);
returnsNothing = resultMeta.return_type.equals(NOTHING);
Expand Down Expand Up @@ -607,14 +609,13 @@ public ResultSet getResultSet() throws SQLException {
throw new SQLException("Statement was closed");
}

if (!returnsResultSet) {
if (!returnsResultSet || selectResultReturned) {
return null;
}

// getResultSet can only be called once per result
ResultSet to_return = selectResult;
this.selectResult = null;
return to_return;
this.selectResultReturned = true;
return selectResult;
}

private long getUpdateCountInternal() throws SQLException {
Expand Down Expand Up @@ -1374,6 +1375,7 @@ private void clearResults() throws SQLException {
if (selectResult != null) {
selectResult.close();
selectResult = null;
selectResultReturned = false;
}
if (chunkedResult != null) {
chunkedResult.close();
Expand Down
24 changes: 24 additions & 0 deletions src/test/java/org/duckdb/TestClosure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,18 @@ public static void test_results_auto_closed_on_conn_close() throws Exception {
assertTrue(stmt.isClosed());
}

public static void test_results_execute_auto_closed_on_conn_close() throws Exception {
Connection conn = DriverManager.getConnection(JDBC_URL);
Statement stmt = conn.createStatement();
stmt.execute("select 42");
ResultSet rs = stmt.getResultSet();
assertNull(stmt.getResultSet());
rs.next();
conn.close();
assertTrue(rs.isClosed());
assertTrue(stmt.isClosed());
}

public static void test_results_auto_closed_on_conn_close_prepared() throws Exception {
Connection conn = DriverManager.getConnection(JDBC_URL);
PreparedStatement ps = conn.prepareStatement("select 42");
Expand All @@ -120,6 +132,18 @@ public static void test_results_auto_closed_on_conn_close_prepared() throws Exce
assertTrue(ps.isClosed());
}

public static void test_results_execute_auto_closed_on_conn_close_prepared() throws Exception {
Connection conn = DriverManager.getConnection(JDBC_URL);
PreparedStatement ps = conn.prepareStatement("select 42");
ps.execute();
ResultSet rs = ps.getResultSet();
assertNull(ps.getResultSet());
rs.next();
conn.close();
assertTrue(rs.isClosed());
assertTrue(ps.isClosed());
}

public static void test_result_chunked_auto_closed_on_conn_close_prepared() throws Exception {
DuckDBConnection conn = DriverManager.getConnection(JDBC_URL).unwrap(DuckDBConnection.class);
DuckDBPreparedStatement ps = conn.prepare("select 42");
Expand Down
Loading