Merge [TRAFODION-1896] PR-393 CQD TRAF_UPSERT_WITH_INSERT_DEFAULT_SEMANTICS
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a837667d Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a837667d Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a837667d Branch: refs/heads/master Commit: a837667d701c3c621e4b8df7c39ed0f1753cbf95 Parents: 19f236f 99224dd Author: Suresh Subbiah <[email protected]> Authored: Thu Mar 31 22:36:36 2016 +0000 Committer: Suresh Subbiah <[email protected]> Committed: Thu Mar 31 22:36:36 2016 +0000 ---------------------------------------------------------------------- core/sql/generator/GenRelUpdate.cpp | 6 +- core/sql/optimizer/BindRelExpr.cpp | 48 ++-- core/sql/regress/seabase/EXPECTED020 | 374 +++++++++++++++++++++++++++++- core/sql/regress/seabase/TEST020 | 99 +++++++- core/sql/sqlcomp/DefaultConstants.h | 9 +- core/sql/sqlcomp/nadefaults.cpp | 10 +- 6 files changed, 513 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a837667d/core/sql/sqlcomp/nadefaults.cpp ----------------------------------------------------------------------
