You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by ry...@apache.org on 2016/11/28 04:35:12 UTC
[3/4] incubator-trafodion git commit: update the error message for
SHA2
update the error message for SHA2
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/34465b7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/34465b7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/34465b7a
Branch: refs/heads/master
Commit: 34465b7a385b4cdd0a46933cf0a4beda58a2a27c
Parents: e6ab815
Author: Weiqing Xu <we...@esgyn.cn>
Authored: Sun Nov 27 15:46:30 2016 +0000
Committer: Weiqing Xu <we...@esgyn.cn>
Committed: Sun Nov 27 15:46:30 2016 +0000
----------------------------------------------------------------------
core/sql/optimizer/BindItemExpr.cpp | 1 -
core/sql/parser/sqlparser.y | 2 +-
core/sql/regress/compGeneral/EXPECTED006.SB | 8 ++++----
3 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/34465b7a/core/sql/optimizer/BindItemExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/BindItemExpr.cpp b/core/sql/optimizer/BindItemExpr.cpp
index c4d21b5..d811efd 100644
--- a/core/sql/optimizer/BindItemExpr.cpp
+++ b/core/sql/optimizer/BindItemExpr.cpp
@@ -3167,7 +3167,6 @@ ItemExpr *BuiltinFunction::bindNode(BindWA *bindWA)
case ITM_MD5:
case ITM_CRC32:
case ITM_SHA1:
- case ITM_SHA2:
case ITM_SOUNDEX:
case ITM_SHA2_224:
case ITM_SHA2_256:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/34465b7a/core/sql/parser/sqlparser.y
----------------------------------------------------------------------
diff --git a/core/sql/parser/sqlparser.y b/core/sql/parser/sqlparser.y
index 05860ba..11f3067 100755
--- a/core/sql/parser/sqlparser.y
+++ b/core/sql/parser/sqlparser.y
@@ -9729,7 +9729,7 @@ misc_function :
break;
default:
- *SqlParser_Diags << DgSqlCode(-4045) << DgString0("SHA2");
+ yyerror("The second operand expects 0, 224, 256, 384 or 512");
YYERROR;
break;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/34465b7a/core/sql/regress/compGeneral/EXPECTED006.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/EXPECTED006.SB b/core/sql/regress/compGeneral/EXPECTED006.SB
index 9e9d9e2..741b6dc 100644
--- a/core/sql/regress/compGeneral/EXPECTED006.SB
+++ b/core/sql/regress/compGeneral/EXPECTED006.SB
@@ -1706,7 +1706,7 @@ d3d9446802a44259755d38e6d163e820 852952723 b1d5781111d84f7b3fe45a0852e59758cd
>>select SOUNDEX('Jon') from dual;
(EXPR)
-------
+----------
J500
@@ -1714,7 +1714,7 @@ J500
>>select SOUNDEX('Roy') from dual;
(EXPR)
-------
+----------
R000
@@ -1722,7 +1722,7 @@ R000
>>select SOUNDEX('Lynn') from dual;
(EXPR)
-------
+----------
L500
@@ -1789,7 +1789,7 @@ Lynn L500
--- 1 row(s) selected.
>>select sha2('the original data', 128) from dual;
-*** ERROR[4045] The operand of function SHA2 must be numeric.
+*** ERROR[15002] Internal parser error: The second operand expects 0, 224, 256, 384 or 512.
*** ERROR[8822] The statement was not prepared.