fix review comments
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/9e5b5844 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/9e5b5844 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/9e5b5844 Branch: refs/heads/master Commit: 9e5b5844f08d87abe8ff3557e48c51526e34e8e4 Parents: 508f4c4 Author: Liu Ming <ovis_p...@sina.com> Authored: Wed Jul 25 05:18:18 2018 -0400 Committer: Liu Ming <ovis_p...@sina.com> Committed: Wed Jul 25 05:18:18 2018 -0400 ---------------------------------------------------------------------- core/sql/common/NAString.cpp | 1 + core/sql/regress/core/EXPECTED037.SB | 7 +++++++ core/sql/regress/core/TEST037 | 4 ++++ 3 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/9e5b5844/core/sql/common/NAString.cpp ---------------------------------------------------------------------- diff --git a/core/sql/common/NAString.cpp b/core/sql/common/NAString.cpp index 107e620..5a8fad7 100644 --- a/core/sql/common/NAString.cpp +++ b/core/sql/common/NAString.cpp @@ -1213,6 +1213,7 @@ static NABoolean tokIsFuncOrParenKeyword(const NAString &sqlText, "STDDEV ", // Tandem-extension "SUBSTRING ", // ANSI "SUM ", // ANSI + "SYS_GUID ", // Oracle-extension "TAN ", // Tandem-extension "TANH ", // Tandem-extension "TIME ", // Datatype with scales/precisions/length http://git-wip-us.apache.org/repos/asf/trafodion/blob/9e5b5844/core/sql/regress/core/EXPECTED037.SB ---------------------------------------------------------------------- diff --git a/core/sql/regress/core/EXPECTED037.SB b/core/sql/regress/core/EXPECTED037.SB index a14770c..6649293 100755 --- a/core/sql/regress/core/EXPECTED037.SB +++ b/core/sql/regress/core/EXPECTED037.SB @@ -205,6 +205,7 @@ +>, STORE int not null +>, SUBCLASS_ORIGIN int not null +>, SUBSYSTEM_ID int not null ++>, SYS_GUID int not null +>, system_name int not null +>, TABLE_NAME int not null +>, TYPE int not null @@ -285,6 +286,7 @@ , STORE INT NO DEFAULT NOT NULL NOT DROPPABLE , SUBCLASS_ORIGIN INT NO DEFAULT NOT NULL NOT DROPPABLE , SUBSYSTEM_ID INT NO DEFAULT NOT NULL NOT DROPPABLE + , SYS_GUID INT NO DEFAULT NOT NULL NOT DROPPABLE , SYSTEM_NAME INT NO DEFAULT NOT NULL NOT DROPPABLE , TABLE_NAME INT NO DEFAULT NOT NULL NOT DROPPABLE , TYPE INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -4873,6 +4875,11 @@ SELECT DUAL DUAL from (values(0)) DUAL(DUAL); --- SQL command prepared. >> >>-- Expect success +>>prepare s1 from SELECT SYS_GUID SYS_GUID from (values(0)) SYS_GUID (SYS_GUID); + +--- SQL command prepared. +>> +>>-- Expect success >>prepare s1 from SELECT T T from (values(0)) T(T); --- SQL command prepared. http://git-wip-us.apache.org/repos/asf/trafodion/blob/9e5b5844/core/sql/regress/core/TEST037 ---------------------------------------------------------------------- diff --git a/core/sql/regress/core/TEST037 b/core/sql/regress/core/TEST037 index c7c51c5..1fb152f 100755 --- a/core/sql/regress/core/TEST037 +++ b/core/sql/regress/core/TEST037 @@ -171,6 +171,7 @@ create table system_name , STORE int not null , SUBCLASS_ORIGIN int not null , SUBSYSTEM_ID int not null +, SYS_GUID int not null , system_name int not null , TABLE_NAME int not null , TYPE int not null @@ -1889,6 +1890,9 @@ prepare s1 from SELECT SUBCLASS_ORIGIN SUBCLASS_ORIGIN from (values(0)) SUBCLASS prepare s1 from SELECT SUBSYSTEM_ID SUBSYSTEM_ID from (values(0)) SUBSYSTEM_ID(SUBSYSTEM_ID); -- Expect success +prepare s1 from SELECT SYS_GUID SYS_GUID from (values(0)) SYS_GUID (SYS_GUID); + +-- Expect success prepare s1 from SELECT T T from (values(0)) T(T); -- Expect success
