Repository: incubator-trafodion Updated Branches: refs/heads/master 44660e413 -> b7dd48c1f
jira1743 Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b1ff89f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b1ff89f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b1ff89f1 Branch: refs/heads/master Commit: b1ff89f145063ef633c8852495db875668c2fbd2 Parents: 7ad34b1 Author: traf <[email protected]> Authored: Mon Jun 27 05:21:01 2016 +0000 Committer: traf <[email protected]> Committed: Mon Jun 27 05:21:01 2016 +0000 ---------------------------------------------------------------------- core/conn/jdbc_type2/native/CoreCommon.h | 2 ++ core/conn/jdbc_type2/native/SQLMXConnection.cpp | 14 ++++++++++++++ core/conn/jdbc_type2/native/SrvrOthers.cpp | 9 +++++++++ 3 files changed, 25 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b1ff89f1/core/conn/jdbc_type2/native/CoreCommon.h ---------------------------------------------------------------------- diff --git a/core/conn/jdbc_type2/native/CoreCommon.h b/core/conn/jdbc_type2/native/CoreCommon.h index 92fc1c8..c131173 100644 --- a/core/conn/jdbc_type2/native/CoreCommon.h +++ b/core/conn/jdbc_type2/native/CoreCommon.h @@ -440,6 +440,8 @@ typedef struct _SRVR_GLOBAL_Def #define CLEAR_SCHEMA 1013 #define CQD_DOOM_USER_TXN 1014 #define CQD_PCODE_OFF 1015 +#define BEGIN_SESSION 1016 +#define END_SESSION 1017 typedef struct tagDATE_TYPE { http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b1ff89f1/core/conn/jdbc_type2/native/SQLMXConnection.cpp ---------------------------------------------------------------------- diff --git a/core/conn/jdbc_type2/native/SQLMXConnection.cpp b/core/conn/jdbc_type2/native/SQLMXConnection.cpp index b25d940..e8fd2d1 100644 --- a/core/conn/jdbc_type2/native/SQLMXConnection.cpp +++ b/core/conn/jdbc_type2/native/SQLMXConnection.cpp @@ -590,6 +590,20 @@ JNIEXPORT void JNICALL Java_org_trafodion_jdbc_t2_SQLMXConnection_connectInit strcpy(srvrGlobal->CurrentSchema, "SEABASE"); } + + odbc_SQLSvc_SetConnectionOption_sme_(NULL, NULL, + &setConnectException, + dialogueId, + BEGIN_SESSION, + 0, + NULL, + &sqlWarning); + if (setConnectException.exception_nr != CEE_SUCCESS) + { + throwSetConnectionException(jenv, &setConnectException); + FUNCTION_RETURN_VOID(("BEGIN_SESSION - setConnectException.exception_nr(%s) is not CEE_SUCCESS", + CliDebugSqlError(setConnectException.exception_nr))); + } if(blnDoomUsrTxn) { http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b1ff89f1/core/conn/jdbc_type2/native/SrvrOthers.cpp ---------------------------------------------------------------------- diff --git a/core/conn/jdbc_type2/native/SrvrOthers.cpp b/core/conn/jdbc_type2/native/SrvrOthers.cpp index 16fa01e..08d8a7c 100644 --- a/core/conn/jdbc_type2/native/SrvrOthers.cpp +++ b/core/conn/jdbc_type2/native/SrvrOthers.cpp @@ -1125,6 +1125,15 @@ odbc_SQLSvc_SetConnectionOption_sme_( } strcat(sqlString, schemaValueStr); break; + case BEGIN_SESSION: + if(optionValueStr != NULL && strlen(optionValueStr) > 0) + sprintf(sqlString,"SET SESSION DEFAULT SQL_SESSION 'BEGIN:%0.200s';",optionValueStr); + else + strcpy(sqlString, "SET SESSION DEFAULT SQL_SESSION 'BEGIN';"); + break; + case END_SESSION: + strcpy(sqlString, "SET SESSION DEFAULT SQL_SESSION 'END'"); + break; case RESET_DEFAULTS: strcpy(sqlString, "CONTROL QUERY DEFAULT * RESET"); break;
