aboutsummaryrefslogtreecommitdiff
path: root/src/interfaces/odbc/options.c
diff options
context:
space:
mode:
authorHiroshi Inoue <inoue@tpf.co.jp>2002-02-18 03:16:11 +0000
committerHiroshi Inoue <inoue@tpf.co.jp>2002-02-18 03:16:11 +0000
commit3c16d095b5b395560a567db8ae8cfa06899150f9 (patch)
tree35c051e30bea40eb4003f2749117cb6ab627f1d0 /src/interfaces/odbc/options.c
parentb6db89a02d187a42e33fc3af8170749f22fdac99 (diff)
downloadpostgresql-3c16d095b5b395560a567db8ae8cfa06899150f9.tar.gz
postgresql-3c16d095b5b395560a567db8ae8cfa06899150f9.zip
The version is now 7.01.0010.
1) Handle parameter array. 2) Allow re-use of the connection handle after SQLDisconnect. 3) Reject NULL if no indicator specified. 4) Improve the handling of '_' in table name. 5) Unify internal begin/commit/abort operations. 6) Change SQLTables() to return null not "" for the table_owner. 7) Fix a bug about parameter handling reported by Benoit Menendez. 8) Add cast in handling ODBC date/time escape sequences. 9) Fix a bug about cache_size handing in declare/fetch mode. [ODBC3.0 related] 10) Improve the handling of descriptor handles(ODBC3.0). 11) Improve the type handling of some types for ODBC3.0. [Thanks to Marcelo Aceto for his useful patches] 12) Allow nested ODBC escape. 13) Allow changing autocommit on/off inside the transaction block. 14) Improve the handling of ODBC scalar functions.
Diffstat (limited to 'src/interfaces/odbc/options.c')
-rw-r--r--src/interfaces/odbc/options.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/interfaces/odbc/options.c b/src/interfaces/odbc/options.c
index bf2707f4dae..80ec7dac68e 100644
--- a/src/interfaces/odbc/options.c
+++ b/src/interfaces/odbc/options.c
@@ -342,14 +342,12 @@ PGAPI_SetConnectOption(
break;
case SQL_AUTOCOMMIT:
+ if (vParam == SQL_AUTOCOMMIT_ON && CC_is_in_autocommit(conn))
+ break;
+ else if (vParam == SQL_AUTOCOMMIT_OFF && !CC_is_in_autocommit(conn))
+ break;
if (CC_is_in_trans(conn))
- {
- conn->errormsg = "Cannot switch commit mode while a transaction is in progress";
- conn->errornumber = CONN_TRANSACT_IN_PROGRES;
- CC_log_error(func, "", conn);
- return SQL_ERROR;
- }
-
+ CC_commit(conn);
mylog("PGAPI_SetConnectOption: AUTOCOMMIT: transact_status=%d, vparam=%d\n", conn->transact_status, vParam);
switch (vParam)
@@ -475,7 +473,7 @@ PGAPI_GetConnectOption(
break;
case SQL_TXN_ISOLATION: /* NOT SUPPORTED */
- *((UDWORD *) pvParam) = SQL_TXN_SERIALIZABLE;
+ *((UDWORD *) pvParam) = SQL_TXN_READ_COMMITTED;
break;
/* These options should be handled by driver manager */