Merge remote branch 'origin/master' into ansharma_tsnano_br
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/6bcca437 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/6bcca437 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/6bcca437 Branch: refs/heads/master Commit: 6bcca437a6a6850976dcfd0026df5834f52cf924 Parents: 50c2a89 877339a Author: Anoop Sharma <[email protected]> Authored: Fri Jun 15 15:27:19 2018 +0000 Committer: Anoop Sharma <[email protected]> Committed: Fri Jun 15 15:27:19 2018 +0000 ---------------------------------------------------------------------- .../jdbc/t4/CONNECTION_CONTEXT_def.java | 1 + .../jdbc/t4/InitializeDialogueMessage.java | 3 +- .../trafodion/jdbc/t4/InterfaceConnection.java | 7 +- .../trafodion/jdbc/t4/InterfaceResultSet.java | 103 ++- .../org/trafodion/jdbc/t4/T4DSProperties.java | 3 + .../org/trafodion/jdbc/t4/T4Properties.java | 32 +- .../java/org/trafodion/jdbc/t4/TRANSPORT.java | 1 + .../org/trafodion/jdbc/t4/TrafT4Statement.java | 4 +- core/conn/odbc/src/odbc/Common/Global.h | 3 + .../odbc/Krypton/generated_incs/odbcCommon.h | 1 + .../src/odbc/nsksrvr/Interface/odbcs_srvr.cpp | 1 + core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 1 + .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 124 +++- core/sqf/src/trafconf/tctrace.h | 2 +- core/sql/common/ComAnsiNamePart.cpp | 24 + core/sql/common/ComAnsiNamePart.h | 2 + core/sql/generator/GenPreCode.cpp | 1 + core/sql/optimizer/NATable.cpp | 5 + core/sql/optimizer/NATable.h | 1 + core/sql/parser/ElemDDLConstraintPK.h | 23 +- core/sql/parser/StmtDDLCreate.cpp | 28 +- core/sql/parser/sqlparser.y | 42 +- core/sql/regress/core/EXPECTED056.SB | 6 + core/sql/regress/core/TEST056 | 2 + core/sql/regress/executor/EXPECTED122 | 27 +- core/sql/regress/executor/TEST122 | 5 +- core/sql/regress/privs2/TEST138 | 1 + core/sql/regress/seabase/EXPECTED020 | 58 +- core/sql/regress/seabase/EXPECTED031 | 14 +- core/sql/regress/seabase/EXPECTED032 | 248 +++++++- core/sql/regress/seabase/TEST020 | 4 +- core/sql/regress/seabase/TEST032 | 56 ++ core/sql/sqlcomp/CmpDescribe.cpp | 68 +- core/sql/sqlcomp/CmpDescribe.h | 1 + core/sql/sqlcomp/CmpSeabaseDDL.h | 8 +- core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 13 +- core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 636 ++++++++++++------- core/sql/sqlcomp/DefaultConstants.h | 16 + core/sql/sqlcomp/nadefaults.cpp | 8 +- 39 files changed, 1234 insertions(+), 349 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/6bcca437/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceResultSet.java ----------------------------------------------------------------------
