Skip to content

Don't throw exception if transaction is empty #88

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
ShansOwn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't throw exception if transaction is empty #88

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
5 changes: 3 additions & 2 deletions fluent-jdbc/src/main/java/org/codejargon/fluentjdbc/internal/query/TransactionInternal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.codejargon.fluentjdbc.internal.query;

import org.codejargon.fluentjdbc.api.FluentJdbcException;
import org.codejargon.fluentjdbc.api.FluentJdbcSqlException;
import org.codejargon.fluentjdbc.api.integration.ConnectionProvider;
import org.codejargon.fluentjdbc.api.query.Transaction;
Expand Down Expand Up @@ -63,7 +62,9 @@ private <T> T inNewTransaction(Supplier<T> operation, Map<ConnectionProvider, Co
}
throw e;
}
con.commit();
if (!con.getAutoCommit()) {
con.commit();
}
} catch(SQLException e) {
throw new FluentJdbcSqlException("Error executing transaction", e);
} finally {
Expand Down
21 changes: 21 additions & 0 deletions ...src/test/groovy/org/codejargon/fluentjdbc/internal/query/FluentJdbcTransactionTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,27 @@ class FluentJdbcTransactionTest extends UpdateTestBase {
1 * connection.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE)
}

def "Empty transaction doesn't throw exception"() {
given:
preparedStatement.executeUpdate() >> expectedUpdatedRows.intValue()
when:
query.transaction().in(
{ ->
// no queries
}
)
then:
// checking original state, then check before commit
connection.getAutoCommit() >> true >> true

_ * connection.getAutoCommit()
0 * connection.setAutoCommit(false)
0 * preparedStatement.close()
0 * connection.rollback()
0 * connection.commit()
1 * connection.setAutoCommit(true)
}

def throwException() {
throw new MyRuntimeException()
}
Expand Down