trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hzel...@apache.org
Subject [4/6] incubator-trafodion git commit: fix parser and test037 issue
Date Tue, 19 Jul 2016 01:17:54 GMT
fix parser and test037 issue


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/3369cd05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/3369cd05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/3369cd05

Branch: refs/heads/master
Commit: 3369cd0513037a7145359482747ace1ec5e7389e
Parents: b938430
Author: Liu Ming <ovis_poly@sina.com>
Authored: Sat Jul 16 23:48:42 2016 +0000
Committer: Liu Ming <ovis_poly@sina.com>
Committed: Sat Jul 16 23:48:42 2016 +0000

----------------------------------------------------------------------
 core/sql/parser/sqlparser.y          |  4 ----
 core/sql/regress/core/EXPECTED037.SB | 12 ------------
 core/sql/regress/core/TEST037        |  3 ---
 3 files changed, 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3369cd05/core/sql/parser/sqlparser.y
----------------------------------------------------------------------
diff --git a/core/sql/parser/sqlparser.y b/core/sql/parser/sqlparser.y
index 74c2718..e1e6661 100755
--- a/core/sql/parser/sqlparser.y
+++ b/core/sql/parser/sqlparser.y
@@ -7055,14 +7055,10 @@ with_clause_element : correlation_name TOK_AS '(' query_expression
')'
                           {
                             *SqlParser_Diags << DgSqlCode(-3288)
                                              << DgString0((*$1).toCharStar());
-                             delete $1;
-                             delete $4;
                              YYERROR;
                           }
 
                           SqlParser_CurrentParser->insertWithDefinition($1 , $$);
-                          delete $1;
-                          delete $4;
                       }
 
 rel_subquery_as_clause_and_col_list : rel_subquery as_clause '(' derived_column_list ')'

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3369cd05/core/sql/regress/core/EXPECTED037.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/EXPECTED037.SB b/core/sql/regress/core/EXPECTED037.SB
index be117f4..b7ebcb7 100755
--- a/core/sql/regress/core/EXPECTED037.SB
+++ b/core/sql/regress/core/EXPECTED037.SB
@@ -919,18 +919,6 @@ SELECT PROTECTED PROTECTED from (values(0)) PROTECTED(PROTECTED);
 
 >>
 >>-- Expect error [3128]
->>prepare s1 from SELECT RECURSIVE RECURSIVE from (values(0)) RECURSIVE(RECURSIVE);
-
-*** ERROR[3128] RECURSIVE is a reserved word.  It must be delimited by double-quotes to be
used as an identifier.
-
-*** ERROR[15001] A syntax error occurred at or before: 
-SELECT RECURSIVE RECURSIVE from (values(0)) RECURSIVE(RECURSIVE);
-                         ^ (26 characters from start of SQL statement)
-
-*** ERROR[8822] The statement was not prepared.
-
->>
->>-- Expect error [3128]
 >>prepare s1 from SELECT REF REF from (values(0)) REF(REF);
 
 *** ERROR[3128] REF is a reserved word.  It must be delimited by double-quotes to be used
as an identifier.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3369cd05/core/sql/regress/core/TEST037
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/TEST037 b/core/sql/regress/core/TEST037
index 711632f..f768a86 100755
--- a/core/sql/regress/core/TEST037
+++ b/core/sql/regress/core/TEST037
@@ -344,9 +344,6 @@ prepare s1 from SELECT PRIVATE PRIVATE from (values(0)) PRIVATE(PRIVATE);
 prepare s1 from SELECT PROTECTED PROTECTED from (values(0)) PROTECTED(PROTECTED);
 
 -- Expect error [3128]
-prepare s1 from SELECT RECURSIVE RECURSIVE from (values(0)) RECURSIVE(RECURSIVE);
-
--- Expect error [3128]
 prepare s1 from SELECT REF REF from (values(0)) REF(REF);
 
 -- Expect error [3128]


Mime
View raw message