From 5b72f5c9f488545383a990b9de1fbc36738f1e06 Mon Sep 17 00:00:00 2001 From: Marco Zanon Date: Thu, 26 Jan 2012 22:17:25 +0000 Subject: [PATCH] Removed custom code for starting and managing database transactions, and used standard JDBC methods instead. --- src/java/com/marcozanon/macaco/sql/MSqlConnection.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/java/com/marcozanon/macaco/sql/MSqlConnection.java b/src/java/com/marcozanon/macaco/sql/MSqlConnection.java index f9652cc..3b5779b 100644 --- a/src/java/com/marcozanon/macaco/sql/MSqlConnection.java +++ b/src/java/com/marcozanon/macaco/sql/MSqlConnection.java @@ -166,7 +166,7 @@ public class MSqlConnection extends MObject { throw new MTransactionSqlException("Nested transactions not allowed."); } try { - this.getConnectionReference().createStatement().executeUpdate("START TRANSACTION"); + this.getConnectionReference().setAutoCommit(false); this.setTransactionStatus(MSqlConnection.TransactionStatus.SUCCESSFUL); } catch (SQLException exception) { @@ -176,10 +176,10 @@ public class MSqlConnection extends MObject { public void rollBackTransaction() throws MTransactionSqlException { if (MSqlConnection.TransactionStatus.CLOSED == this.getTransactionStatus()) { - throw new MTransactionSqlException("Could not find transaction."); + throw new MTransactionSqlException("Transaction not started."); } try { - this.getConnectionReference().createStatement().executeUpdate("ROLLBACK"); + this.getConnectionReference().rollback(); this.setTransactionStatus(MSqlConnection.TransactionStatus.CLOSED); } catch (SQLException exception) { @@ -192,7 +192,7 @@ public class MSqlConnection extends MObject { switch (this.getTransactionStatus()) { case SUCCESSFUL: try { - this.getConnectionReference().createStatement().executeUpdate("COMMIT"); + this.getConnectionReference().commit(); this.setTransactionStatus(MSqlConnection.TransactionStatus.CLOSED); return MSqlConnection.TransactionStatus.SUCCESSFUL; } @@ -204,7 +204,7 @@ public class MSqlConnection extends MObject { this.rollBackTransaction(); return MSqlConnection.TransactionStatus.FAILED; default: // instead of "case CLOSED:" (necessary to avoid Java compilation errors) - throw new MTransactionSqlException("Could not find transaction."); + throw new MTransactionSqlException("Transaction not started."); } } -- 2.30.2