summaryrefslogtreecommitdiff
path: root/dbd/apr_dbd_sqlite3.c
diff options
context:
space:
mode:
authorbojan <bojan@13f79535-47bb-0310-9956-ffa450edef68>2006-04-29 01:06:31 +0000
committerbojan <bojan@13f79535-47bb-0310-9956-ffa450edef68>2006-04-29 01:06:31 +0000
commite39fa8521d0960a55a9eccb62636e1ed053b4999 (patch)
treeb8c3a3da6f381acdf16705d52b074f476e702410 /dbd/apr_dbd_sqlite3.c
parenta38f34475d3a98136678a25031595292f1ca2e1a (diff)
downloadlibapr-util-e39fa8521d0960a55a9eccb62636e1ed053b4999.tar.gz
Fix SQLite3 double commit attempt
Remove semicolons that are not required and other unnecessary verbosity. git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@398048 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'dbd/apr_dbd_sqlite3.c')
-rw-r--r--dbd/apr_dbd_sqlite3.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/dbd/apr_dbd_sqlite3.c b/dbd/apr_dbd_sqlite3.c
index 7fa05e87..fdf51405 100644
--- a/dbd/apr_dbd_sqlite3.c
+++ b/dbd/apr_dbd_sqlite3.c
@@ -339,7 +339,7 @@ static int dbd_sqlite3_start_transaction(apr_pool_t *pool,
int ret = 0;
int nrows = 0;
- ret = dbd_sqlite3_query(handle, &nrows, "BEGIN TRANSACTION;");
+ ret = dbd_sqlite3_query(handle, &nrows, "BEGIN");
if (!*trans) {
*trans = apr_pcalloc(pool, sizeof(apr_dbd_transaction_t));
(*trans)->handle = handle;
@@ -351,16 +351,15 @@ static int dbd_sqlite3_start_transaction(apr_pool_t *pool,
static int dbd_sqlite3_end_transaction(apr_dbd_transaction_t *trans)
{
- int ret = 0;
+ int ret = -1; /* ending transaction that was never started is an error */
int nrows = 0;
if (trans) {
- ret = dbd_sqlite3_query(trans->handle, &nrows, "END TRANSACTION;");
if (trans->errnum) {
trans->errnum = 0;
- ret = dbd_sqlite3_query(trans->handle, &nrows, "ROLLBACK;");
+ ret = dbd_sqlite3_query(trans->handle, &nrows, "ROLLBACK");
} else {
- ret = dbd_sqlite3_query(trans->handle, &nrows, "COMMIT;");
+ ret = dbd_sqlite3_query(trans->handle, &nrows, "COMMIT");
}
trans->handle->trans = NULL;
}