Skip to content

Fix executeBatch in auto-commit mode #261

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
Jun 14, 2025
Merged

Fix executeBatch in auto-commit mode #261

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
20 changes: 18 additions & 2 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 @@ -645,11 +645,13 @@ public long[] executeLargeBatch() throws SQLException {

private long[] executeBatchedPreparedStatement() throws SQLException {
stmtRefLock.lock();
boolean tranStarted = false;
DuckDBConnection conn = this.conn;
try {
checkOpen();
checkPrepared();

boolean tranStarted = startTransaction();
tranStarted = startTransaction();

long[] updateCounts = new long[this.batchedParams.size()];
for (int i = 0; i < this.batchedParams.size(); i++) {
Expand All @@ -664,17 +666,25 @@ private long[] executeBatchedPreparedStatement() throws SQLException {
}

return updateCounts;

} catch (SQLException e) {
if (tranStarted && conn.getAutoCommit()) {
conn.rollback();
}
throw e;
} finally {
stmtRefLock.unlock();
}
}

private long[] executeBatchedStatements() throws SQLException {
stmtRefLock.lock();
boolean tranStarted = false;
DuckDBConnection conn = this.conn;
try {
checkOpen();

boolean tranStarted = startTransaction();
tranStarted = startTransaction();

long[] updateCounts = new long[this.batchedStatements.size()];
for (int i = 0; i < this.batchedStatements.size(); i++) {
Expand All @@ -689,6 +699,12 @@ private long[] executeBatchedStatements() throws SQLException {
}

return updateCounts;

} catch (SQLException e) {
if (tranStarted && conn.getAutoCommit()) {
conn.rollback();
}
throw e;
} finally {
stmtRefLock.unlock();
}
Expand Down
99 changes: 99 additions & 0 deletions src/test/java/org/duckdb/TestBatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static org.duckdb.test.Assertions.*;

import java.sql.*;
import java.util.Properties;

public class TestBatch {

Expand Down Expand Up @@ -206,4 +207,102 @@ public static void test_statement_batch_rollback() throws Exception {
}
}
}

public static void test_statement_batch_autocommit_constraint_violation() throws Exception {
try (Connection conn = DriverManager.getConnection(JDBC_URL)) {
assertTrue(conn.getAutoCommit());
try (Statement stmt = conn.createStatement()) {
stmt.execute("CREATE TABLE tab1 (col1 VARCHAR NOT NULL)");
}
try (Statement stmt = conn.createStatement()) {
stmt.addBatch("INSERT INTO tab1 VALUES('foo')");
stmt.addBatch("INSERT INTO tab1 VALUES(NULL)");
assertThrows(stmt::executeBatch, SQLException.class);
}
try (Statement stmt = conn.createStatement();
ResultSet rs = stmt.executeQuery("SELECT count(*) FROM tab1")) {
rs.next();
assertEquals(rs.getLong(1), 0L);
}
}
}

public static void test_prepared_statement_batch_autocommit_constraint_violation() throws Exception {
try (Connection conn = DriverManager.getConnection(JDBC_URL)) {
assertTrue(conn.getAutoCommit());
try (Statement stmt = conn.createStatement()) {
stmt.execute("CREATE TABLE tab1 (col1 VARCHAR NOT NULL)");
}
try (PreparedStatement ps = conn.prepareStatement("INSERT INTO tab1 VALUES(?)")) {
ps.setString(1, "foo");
ps.addBatch();
ps.setString(1, null);
ps.addBatch();
assertThrows(ps::executeBatch, SQLException.class);
}
try (Statement stmt = conn.createStatement();
ResultSet rs = stmt.executeQuery("SELECT count(*) FROM tab1")) {
rs.next();
assertEquals(rs.getLong(1), 0L);
}
}
}

public static void test_statement_batch_constraint_violation() throws Exception {
Properties config = new Properties();
config.put(DuckDBDriver.JDBC_AUTO_COMMIT, false);
try (Connection conn = DriverManager.getConnection(JDBC_URL, config)) {
assertFalse(conn.getAutoCommit());
try (Statement stmt = conn.createStatement()) {
stmt.execute("CREATE TABLE tab1 (col1 VARCHAR NOT NULL)");
conn.commit();
}
boolean thrown = false;
try (Statement stmt = conn.createStatement()) {
stmt.addBatch("INSERT INTO tab1 VALUES('foo')");
stmt.addBatch("INSERT INTO tab1 VALUES(NULL)");
stmt.executeBatch();
conn.commit();
} catch (SQLException e) {
thrown = true;
conn.rollback();
}
assertTrue(thrown);
try (Statement stmt = conn.createStatement();
ResultSet rs = stmt.executeQuery("SELECT count(*) FROM tab1")) {
rs.next();
assertEquals(rs.getLong(1), 0L);
}
}
}

public static void test_prepared_statement_batch_constraint_violation() throws Exception {
Properties config = new Properties();
config.put(DuckDBDriver.JDBC_AUTO_COMMIT, false);
try (Connection conn = DriverManager.getConnection(JDBC_URL, config)) {
assertFalse(conn.getAutoCommit());
try (Statement stmt = conn.createStatement()) {
stmt.execute("CREATE TABLE tab1 (col1 VARCHAR NOT NULL)");
conn.commit();
}
boolean thrown = false;
try (PreparedStatement ps = conn.prepareStatement("INSERT INTO tab1 VALUES(?)")) {
ps.setString(1, "foo");
ps.addBatch();
ps.setString(1, null);
ps.addBatch();
ps.executeBatch();
conn.commit();
} catch (SQLException e) {
thrown = true;
conn.rollback();
}
assertTrue(thrown);
try (Statement stmt = conn.createStatement();
ResultSet rs = stmt.executeQuery("SELECT count(*) FROM tab1")) {
rs.next();
assertEquals(rs.getLong(1), 0L);
}
}
}
}
Loading