+ |
Backend enetic optimizer
|
diff --git a/docs/config.html b/docs/config.html
index cb1c326..8b29ba6 100644
--- a/docs/config.html
+++ b/docs/config.html
@@ -238,23 +238,35 @@ with 6.4 and higher backends.
with 7.4 and higher backends.
-Level of rollback on errors: Specifies what to rollback should an
-error occur.
+TransactionErrorBehavior: Level of rollback on errors, specifies what to
+rollback should an error occur.
-- Nop(0): Don't rollback anything and let the application handle the
-error.
-
-- Transaction(1): Rollback the entire transaction.
-
-- Statement(2): Rollback the statement.
-
-Notes in a setup: This specification is set up with a PROTOCOL option parameter.
-PROTOCOL=[6.2|6.3|6.4|7.4][-(0|1|2)]
-default value is a sentence unit (it is a transaction unit before 8.0).
-
-
-
+Default: Default value. Transaction rollback behavior is chosen
+depending on the database backend version: 'Transaction' for Postgres servers
+older than 8.0 and 'Statement' for servers newer than 8.1.
+
+Nop: Don't rollback anything and let the application handle the
+error.
+
+Transaction: Rollback the entire transaction.
+
+Statement: Rollback the statement.
+Notes:
+
+ -
+ This parameter can be set as an extension of PROTOCOL option
+ parameter.
+ PROTOCOL=[6.2|6.3|6.4|7.4][-(0|1|2)]
+ Default value is a sentence unit (it is a transaction unit
+ before 8.0).
+
+ -
+ This parameter can be set with TRANSACTIONROLLBACKBEHAVIOR as well.
+ This takes precedence on PROTOCOL.
+
+
+.
OID Options:
diff --git a/execute.c b/execute.c
index 1cc4f04..a732eb9 100644
--- a/execute.c
+++ b/execute.c
@@ -651,28 +651,31 @@ inolog("%s:%p->internal=%d\n", func, stmt, stmt->internal);
conn = SC_get_conn(stmt);
if (conn)
ci = &conn->connInfo;
- ret = 0;
- if (!ci || ci->rollback_on_error < 0) /* default */
+ ret = TRANSACTION_ERROR_NOP;
+ if (!ci || ci->transaction_error_value == TRANSACTION_ERROR_DEFAULT)
{
if (conn && PG_VERSION_GE(conn, 8.0))
- ret = 2; /* statement rollback */
+ ret = TRANSACTION_ERROR_STATEMENT;
else
- ret = 1; /* transaction rollback */
+ ret = TRANSACTION_ERROR_TRANSACTION;
}
else
{
- ret = ci->rollback_on_error;
- if (2 == ret && PG_VERSION_LT(conn, 8.0))
- ret = 1;
+ ret = ci->transaction_error_value;
+ if (ret == TRANSACTION_ERROR_STATEMENT &&
+ PG_VERSION_LT(conn, 8.0))
+ ret = TRANSACTION_ERROR_TRANSACTION;
}
switch (ret)
{
- case 1:
+ case TRANSACTION_ERROR_TRANSACTION:
SC_start_tc_stmt(stmt);
break;
- case 2:
+ case TRANSACTION_ERROR_STATEMENT:
SC_start_rb_stmt(stmt);
break;
+ default:
+ break;
}
return ret;
}
diff --git a/info.c b/info.c
index 81bfe6d..a6c7274 100644
--- a/info.c
+++ b/info.c
@@ -4012,7 +4012,7 @@ getClientColumnName(ConnectionClass *conn, UInt4 relid, char *serverColumnName,
BOOL continueExec = TRUE,
bError = FALSE;
QResultClass *res = NULL;
- UWORD flag = IGNORE_ABORT_ON_CONN | ROLLBACK_ON_ERROR;
+ UWORD flag = IGNORE_ABORT_ON_CONN | TRANSACTION_ERROR;
*nameAlloced = FALSE;
if (!conn->original_client_encoding || !isMultibyte(serverColumnName))
diff --git a/multibyte.c b/multibyte.c
index 2f7b594..512b9cc 100644
--- a/multibyte.c
+++ b/multibyte.c
@@ -444,7 +444,7 @@ CC_lookup_cs_new(ConnectionClass *self)
char *encstr = NULL;
QResultClass *res;
- res = CC_send_query(self, "select pg_client_encoding()", NULL, IGNORE_ABORT_ON_CONN | ROLLBACK_ON_ERROR, NULL);
+ res = CC_send_query(self, "select pg_client_encoding()", NULL, IGNORE_ABORT_ON_CONN | TRANSACTION_ERROR, NULL);
if (QR_command_maybe_successful(res))
{
const char *enc = QR_get_value_backend_text(res, 0, 0);
@@ -606,7 +606,7 @@ CC_lookup_characterset(ConnectionClass *self)
BOOL cmd_success;
sprintf(query, "set client_encoding to '%s'", wenc);
- res = CC_send_query(self, query, NULL, IGNORE_ABORT_ON_CONN | ROLLBACK_ON_ERROR, NULL);
+ res = CC_send_query(self, query, NULL, IGNORE_ABORT_ON_CONN | TRANSACTION_ERROR, NULL);
cmd_success = QR_command_maybe_successful(res);
QR_Destructor(res);
CC_set_errornumber(self, errnum);
diff --git a/parse.c b/parse.c
index 5aa7723..a45ddf4 100644
--- a/parse.c
+++ b/parse.c
@@ -382,7 +382,7 @@ static BOOL CheckHasOids(StatementClass * stmt)
snprintf(query, sizeof(query),
"select relhasoids, c.oid from pg_class c, pg_namespace n where relname = '%s' and nspname = '%s' and c.relnamespace = n.oid",
SAFE_NAME(ti->table_name), SAFE_NAME(ti->schema_name));
- res = CC_send_query(conn, query, NULL, ROLLBACK_ON_ERROR | IGNORE_ABORT_ON_CONN, NULL);
+ res = CC_send_query(conn, query, NULL, TRANSACTION_ERROR | IGNORE_ABORT_ON_CONN, NULL);
if (QR_command_maybe_successful(res))
{
stmt->num_key_fields = PG_NUM_NORMAL_KEYS;
@@ -410,7 +410,7 @@ static BOOL CheckHasOids(StatementClass * stmt)
if (!hasoids)
{
sprintf(query, "select a.attname, a.atttypid from pg_index i, pg_attribute a where indrelid=%u and indnatts=1 and indisunique and indexprs is null and indpred is null and i.indrelid = a.attrelid and a.attnum=i.indkey[0] and attnotnull and atttypid in (%d, %d)", ti->table_oid, PG_TYPE_INT4, PG_TYPE_OID);
- res = CC_send_query(conn, query, NULL, ROLLBACK_ON_ERROR | IGNORE_ABORT_ON_CONN, NULL);
+ res = CC_send_query(conn, query, NULL, TRANSACTION_ERROR | IGNORE_ABORT_ON_CONN, NULL);
if (QR_command_maybe_successful(res) && QR_get_num_total_tuples(res) > 0)
{
foundKey = TRUE;
@@ -744,7 +744,7 @@ COL_INFO **coli)
"select nspname from pg_namespace n, pg_class c"
" where c.relnamespace=n.oid and c.oid='\"%s\"'::regclass",
SAFE_NAME(table_name));
- res = CC_send_query(conn, token, NULL, ROLLBACK_ON_ERROR | IGNORE_ABORT_ON_CONN, NULL);
+ res = CC_send_query(conn, token, NULL, TRANSACTION_ERROR | IGNORE_ABORT_ON_CONN, NULL);
if (QR_command_maybe_successful(res))
{
if (QR_get_num_total_tuples(res) == 1)
diff --git a/qresult.c b/qresult.c
index 361be56..11558bb 100644
--- a/qresult.c
+++ b/qresult.c
@@ -487,7 +487,7 @@ QR_free_memory(QResultClass *self)
char cmd[64];
snprintf(cmd, sizeof(cmd), "DEALLOCATE \"%s\"", plannm);
- res = CC_send_query(conn, cmd, NULL, IGNORE_ABORT_ON_CONN | ROLLBACK_ON_ERROR, NULL);
+ res = CC_send_query(conn, cmd, NULL, IGNORE_ABORT_ON_CONN | TRANSACTION_ERROR, NULL);
QR_Destructor(res);
}
}
@@ -710,7 +710,7 @@ QR_close(QResultClass *self)
char buf[64];
if (QR_needs_survival_check(self))
- flag = ROLLBACK_ON_ERROR | IGNORE_ABORT_ON_CONN;
+ flag = TRANSACTION_ERROR | IGNORE_ABORT_ON_CONN;
snprintf(buf, sizeof(buf), "close \"%s\"", QR_get_cursor(self));
/* End the transaction if there are no cursors left on this conn */
@@ -719,7 +719,7 @@ QR_close(QResultClass *self)
CC_cursor_count(conn) <= 1)
{
mylog("QResult: END transaction on conn=%p\n", conn);
- if ((ROLLBACK_ON_ERROR & flag) == 0)
+ if ((TRANSACTION_ERROR & flag) == 0)
{
strlcat(buf, ";commit", sizeof(buf));
flag |= END_WITH_COMMIT;
diff --git a/statement.c b/statement.c
index 19510bf..86f65ac 100644
--- a/statement.c
+++ b/statement.c
@@ -698,7 +698,7 @@ SC_set_prepared(StatementClass *stmt, int prepared)
char dealloc_stmt[128];
sprintf(dealloc_stmt, "DEALLOCATE \"%s\"", stmt->plan_name);
- res = CC_send_query(conn, dealloc_stmt, NULL, IGNORE_ABORT_ON_CONN | ROLLBACK_ON_ERROR, NULL);
+ res = CC_send_query(conn, dealloc_stmt, NULL, IGNORE_ABORT_ON_CONN | TRANSACTION_ERROR, NULL);
QR_Destructor(res);
}
}
diff --git a/test/expected/error-rollback.out b/test/expected/error-rollback.out
index 436a328..51276c8 100644
--- a/test/expected/error-rollback.out
+++ b/test/expected/error-rollback.out
@@ -1,5 +1,5 @@
\! ./src/error-rollback-test
-Test for rollback protocol 0
+Test for Protocol=7.4-0
connected
Executing query that will succeed
Executing query that will fail
@@ -10,7 +10,7 @@ Executing query that will succeed
Result set:
1
disconnecting
-Test for rollback protocol 1
+Test for Protocol=7.4-1
connected
Executing query that will succeed
Executing query that will fail
@@ -20,7 +20,71 @@ Executing query that will succeed
Result set:
1
disconnecting
-Test for rollback protocol 2
+Test for Protocol=7.4-2
+connected
+Executing query that will succeed
+Executing query that will fail
+Failed to execute statement
+22P02=ERROR: invalid input syntax for integer: "foo"
+Executing query that will succeed
+Result set:
+1
+1
+disconnecting
+Test for TransactionErrorBehavior=Nop
+connected
+Executing query that will succeed
+Executing query that will fail
+Failed to execute statement
+22P02=ERROR: invalid input syntax for integer: "foo"
+Rolling back with SQLEndTran
+Executing query that will succeed
+Result set:
+1
+disconnecting
+Test for TransactionErrorBehavior=Transaction
+connected
+Executing query that will succeed
+Executing query that will fail
+Failed to execute statement
+22P02=ERROR: invalid input syntax for integer: "foo"
+Executing query that will succeed
+Result set:
+1
+disconnecting
+Test for TransactionErrorBehavior=Statement
+connected
+Executing query that will succeed
+Executing query that will fail
+Failed to execute statement
+22P02=ERROR: invalid input syntax for integer: "foo"
+Executing query that will succeed
+Result set:
+1
+1
+disconnecting
+Test for TransactionErrorBehavior=Nop;Protocol=7.4-2
+connected
+Executing query that will succeed
+Executing query that will fail
+Failed to execute statement
+22P02=ERROR: invalid input syntax for integer: "foo"
+Rolling back with SQLEndTran
+Executing query that will succeed
+Result set:
+1
+disconnecting
+Test for TransactionErrorBehavior=Transaction;Protocol=7.4-0
+connected
+Executing query that will succeed
+Executing query that will fail
+Failed to execute statement
+22P02=ERROR: invalid input syntax for integer: "foo"
+Executing query that will succeed
+Result set:
+1
+disconnecting
+Test for TransactionErrorBehavior=Statement;Protocol=7.4-1
connected
Executing query that will succeed
Executing query that will fail
diff --git a/test/src/error-rollback-test.c b/test/src/error-rollback-test.c
index 01c0f0c..b21affd 100644
--- a/test/src/error-rollback-test.c
+++ b/test/src/error-rollback-test.c
@@ -142,18 +142,19 @@ error_rollback_print(void)
print_result(hstmt);
}
-int
-main(int argc, char **argv)
+/*
+ * Test for rollback protocol 0 (Nop).
+ *
+ * Additional options can be specified to play with combinations of
+ * Protocol and TransactionErrorBehavior. With protocol 0, it is the
+ * responsability of application to issue rollbacks.
+ */
+void
+error_rollback_test_0(char *options)
{
SQLRETURN rc;
- /*
- * Test for protocol at 0.
- * Do nothing when error occurs and let application do necessary
- * ROLLBACK on error.
- */
- printf("Test for rollback protocol 0\n");
- error_rollback_init("Protocol=7.4-0");
+ error_rollback_init(options);
/* Insert a row correctly */
error_rollback_exec_success();
@@ -181,17 +182,25 @@ main(int argc, char **argv)
/* Clean up */
error_rollback_clean();
+}
- /*
- * Test for rollback protocol 1
- * In case of an error rollback the entire transaction.
- */
- printf("Test for rollback protocol 1\n");
- error_rollback_init("Protocol=7.4-1");
+/*
+ * Test for rollback protocols 1 (Statement) or 2 (Transaction)
+ *
+ * Options can be specified to manipulate the protocol used with Protocol
+ * and TransactionErrorBehavior. When priting results, there should be one
+ * row for protocol 1 as rollback is done for an entire transaction is case
+ * of a failure. There will be two rows for protocol 2 as tollback is issued
+ * for each statement.
+ */
+void
+error_rollback_test_12(char *options)
+{
+ error_rollback_init(options);
/*
- * Insert a row, trigger an error, and re-insert a row. Only one
- * row should be visible here.
+ * Insert a row, trigger an error, and re-insert a row. Depending
+ * on the protocol, one or two rows should be visible.
*/
error_rollback_exec_success();
error_rollback_exec_failure();
@@ -200,23 +209,40 @@ main(int argc, char **argv)
/* Clean up */
error_rollback_clean();
+}
+int
+main(int argc, char **argv)
+{
/*
- * Test for rollback protocol 2
- * In the case of an error rollback only the latest statement.
+ * Test for Protocol only
*/
- printf("Test for rollback protocol 2\n");
- error_rollback_init("Protocol=7.4-2");
+ printf("Test for Protocol=7.4-0\n");
+ error_rollback_test_0("Protocol=7.4-0");
+ printf("Test for Protocol=7.4-1\n");
+ error_rollback_test_12("Protocol=7.4-1");
+ printf("Test for Protocol=7.4-2\n");
+ error_rollback_test_12("Protocol=7.4-2");
/*
- * Similarly to previous case, do insert, error and insert. This
- * time two rows should be visible.
+ * Now do the same tests as previously, but this time for
+ * TransactionErrorBehavior.
*/
- error_rollback_exec_success();
- error_rollback_exec_failure();
- error_rollback_exec_success();
- error_rollback_print();
+ printf("Test for TransactionErrorBehavior=Nop\n");
+ error_rollback_test_0("TransactionErrorBehavior=0");
+ printf("Test for TransactionErrorBehavior=Transaction\n");
+ error_rollback_test_12("TransactionErrorBehavior=Transaction");
+ printf("Test for TransactionErrorBehavior=Statement\n");
+ error_rollback_test_12("TransactionErrorBehavior=Statement");
- /* Clean up */
- error_rollback_clean();
+ /*
+ * Combinations of TransactionErrorBehavior and Protocol, the former
+ * should have the priority.
+ */
+ printf("Test for TransactionErrorBehavior=Nop;Protocol=7.4-2\n");
+ error_rollback_test_0("TransactionErrorBehavior=Nop;Protocol=7.4-2");
+ printf("Test for TransactionErrorBehavior=Transaction;Protocol=7.4-0\n");
+ error_rollback_test_12("TransactionErrorBehavior=Transaction;Protocol=7.4-0\n"); /* 1 row */
+ printf("Test for TransactionErrorBehavior=Statement;Protocol=7.4-1\n");
+ error_rollback_test_12("TransactionErrorBehavior=Statement;Protocol=7.4-1\n"); /* 2 rows */
}
|