Skip to content

More prepared statement enhancements #207

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
merged 1 commit into from
May 5, 2025
Merged

More prepared statement enhancements #207

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
104 changes: 87 additions & 17 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 @@ -47,7 +47,7 @@ public class DuckDBPreparedStatement implements PreparedStatement {
volatile boolean closeOnCompletion = false;

private DuckDBResultSet selectResult = null;
private int updateResult = 0;
private long updateResult = 0;

private boolean returnsChangedRows = false;
private boolean returnsNothing = false;
Expand Down Expand Up @@ -188,7 +188,7 @@ private boolean execute(boolean startTransaction) throws SQLException {

if (returnsChangedRows) {
if (selectResult.next()) {
updateResult = selectResult.getInt(1);
updateResult = selectResult.getLong(1);
}
selectResult.close();
}
Expand All @@ -208,6 +208,12 @@ public ResultSet executeQuery() throws SQLException {

@Override
public int executeUpdate() throws SQLException {
long res = executeLargeUpdate();
return intFromLong(res);
}

@Override
public long executeLargeUpdate() throws SQLException {
requireNonBatch();
execute();
if (!(returnsChangedRows || returnsNothing)) {
Expand All @@ -232,8 +238,14 @@ public ResultSet executeQuery(String sql) throws SQLException {

@Override
public int executeUpdate(String sql) throws SQLException {
long res = executeLargeUpdate(sql);
return intFromLong(res);
}

@Override
public long executeLargeUpdate(String sql) throws SQLException {
prepare(sql);
return executeUpdate();
return executeLargeUpdate();
}

@Override
Expand Down Expand Up @@ -377,12 +389,22 @@ public void setMaxFieldSize(int max) throws SQLException {

@Override
public int getMaxRows() throws SQLException {
return (int) getLargeMaxRows();
}

@Override
public void setMaxRows(int max) throws SQLException {
setLargeMaxRows(max);
}

@Override
public long getLargeMaxRows() throws SQLException {
checkOpen();
return 0;
}

@Override
public void setMaxRows(int max) throws SQLException {
public void setLargeMaxRows(long max) throws SQLException {
checkOpen();
}

Expand Down Expand Up @@ -450,12 +472,14 @@ public ResultSet getResultSet() throws SQLException {
return to_return;
}

private Integer getUpdateCountInternal() throws SQLException {
private long getUpdateCountInternal() throws SQLException {
if (isClosed()) {
throw new SQLException("Statement was closed");
}
if (stmtRef == null) {
throw new SQLException("Prepare something first");
// It is not required by JDBC spec to return anything in this case,
// but clients can call this method before preparing/executing the query
return -1;
}

if (returnsResultSet || returnsNothing || selectResult.isFinished()) {
Expand All @@ -465,11 +489,17 @@ private Integer getUpdateCountInternal() throws SQLException {
}

@Override
public int getUpdateCount() throws SQLException {
public long getLargeUpdateCount() throws SQLException {
// getUpdateCount can only be called once per result
int to_return = getUpdateCountInternal();
long res = getUpdateCountInternal();
updateResult = -1;
return to_return;
return res;
}

@Override
public int getUpdateCount() throws SQLException {
long res = getLargeUpdateCount();
return intFromLong(res);
}

@Override
Expand Down Expand Up @@ -534,6 +564,12 @@ public void clearBatch() throws SQLException {

@Override
public int[] executeBatch() throws SQLException {
long[] res = executeLargeBatch();
return intArrayFromLong(res);
}

@Override
public long[] executeLargeBatch() throws SQLException {
checkOpen();
try {
if (this.isPreparedStatement) {
Expand All @@ -546,26 +582,26 @@ public int[] executeBatch() throws SQLException {
}
}

private int[] executeBatchedPreparedStatement() throws SQLException {
int[] updateCounts = new int[this.batchedParams.size()];
private long[] executeBatchedPreparedStatement() throws SQLException {
long[] updateCounts = new long[this.batchedParams.size()];

startTransaction();
for (int i = 0; i < this.batchedParams.size(); i++) {
params = this.batchedParams.get(i);
execute(false);
updateCounts[i] = getUpdateCount();
updateCounts[i] = getUpdateCountInternal();
}
return updateCounts;
}

private int[] executeBatchedStatements() throws SQLException {
int[] updateCounts = new int[this.batchedStatements.size()];
private long[] executeBatchedStatements() throws SQLException {
long[] updateCounts = new long[this.batchedStatements.size()];

startTransaction();
for (int i = 0; i < this.batchedStatements.size(); i++) {
prepare(this.batchedStatements.get(i));
execute(false);
updateCounts[i] = getUpdateCount();
updateCounts[i] = getUpdateCountInternal();
}
return updateCounts;
}
Expand All @@ -590,22 +626,40 @@ public ResultSet getGeneratedKeys() throws SQLException {

@Override
public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
long res = executeLargeUpdate(sql, autoGeneratedKeys);
return intFromLong(res);
}

@Override
public long executeLargeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
if (NO_GENERATED_KEYS == autoGeneratedKeys) {
return executeUpdate(sql);
return executeLargeUpdate(sql);
}
throw new SQLFeatureNotSupportedException("executeUpdate(String sql, int autoGeneratedKeys)");
}

@Override
public int executeUpdate(String sql, int[] columnIndexes) throws SQLException {
long res = executeLargeUpdate(sql, columnIndexes);
return intFromLong(res);
}

@Override
public long executeLargeUpdate(String sql, int[] columnIndexes) throws SQLException {
if (columnIndexes == null || columnIndexes.length == 0) {
return executeUpdate(sql);
return executeLargeUpdate(sql);
}
throw new SQLFeatureNotSupportedException("executeUpdate(String sql, int[] columnIndexes)");
}

@Override
public int executeUpdate(String sql, String[] columnNames) throws SQLException {
long res = executeLargeUpdate(sql, columnNames);
return intFromLong(res);
}

@Override
public long executeLargeUpdate(String sql, String[] columnNames) throws SQLException {
if (columnNames == null || columnNames.length == 0) {
return executeUpdate(sql);
}
Expand Down Expand Up @@ -1085,4 +1139,20 @@ private void setCharacterReaderInternal(int parameterIndex, Reader reader, long
String str = readToString(wrappedReader);
setObject(parameterIndex, str);
}

private int intFromLong(long val) {
if (val <= Integer.MAX_VALUE) {
return (int) val;
} else {
return Integer.MAX_VALUE;
}
}

private int[] intArrayFromLong(long[] arr) {
int[] res = new int[arr.length];
for (int i = 0; i < arr.length; i++) {
res[i] = intFromLong(arr[i]);
}
return res;
}
}
Loading