From be237957454cd7a4e84a5a603bdef6ab3ab8b8e1 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Tue, 29 Dec 2015 02:42:43 +0000 Subject: Reshuffle and add new exceptions --- libodbcpp/odbc-modifycommand.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'libodbcpp/odbc-modifycommand.cpp') diff --git a/libodbcpp/odbc-modifycommand.cpp b/libodbcpp/odbc-modifycommand.cpp index 5d483c5..cb6d3c0 100644 --- a/libodbcpp/odbc-modifycommand.cpp +++ b/libodbcpp/odbc-modifycommand.cpp @@ -15,26 +15,20 @@ ODBC::ModifyCommand::~ModifyCommand() unsigned int ODBC::ModifyCommand::execute(bool anc) { - if (connection.txIsAborted()) { - throw Error("Transaction has been aborted, not issuing any more commands"); - } RETCODE rc = SQLExecute(hStmt); if (!SQL_SUCCEEDED(rc)) { if (rc != SQL_NO_DATA || !anc) { - connection.abortTx(); - throw Error(rc, SQL_HANDLE_STMT, hStmt, "ODBC::ModifyCommand::execute SQLExecute"); + throw Error(rc, SQL_HANDLE_STMT, hStmt); } } SQLLEN rows; rc = SQLRowCount(hStmt, &rows); - if (!SQL_SUCCEEDED(rc)) { - connection.abortTx(); - throw Error(rc, SQL_HANDLE_STMT, hStmt, "ODBC::ModifyCommand::execute SQLRowCount"); + if (!SQL_SUCCEEDED(rc)) { + throw Error(rc, SQL_HANDLE_STMT, hStmt); } if (rows > 0 || anc) { return rows; } - connection.abortTx(); - throw Error("No rows affected"); + throw DB::NoRowsAffected(); } -- cgit v1.2.3