hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

bugfix: support for using current_user function without ending parentheses

Browse Source
This commit is contained in:
obdev
2023-09-09 11:32:59 +00:00
committed by ob-robot
parent 4f3a9fdea4
commit 7198e18f7a
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/sql/parser/sql_parser_mysql_mode.y
View File

@ -373,7 +373,7 @@ END_P SET_VAR DELIMITER
%type <node> create_tenant_stmt opt_tenant_option_list alter_tenant_stmt drop_tenant_stmt create_standby_tenant_stmt log_restore_source_option %type <node> create_tenant_stmt opt_tenant_option_list alter_tenant_stmt drop_tenant_stmt create_standby_tenant_stmt log_restore_source_option
%type <node> create_restore_point_stmt drop_restore_point_stmt %type <node> create_restore_point_stmt drop_restore_point_stmt
%type <node> create_resource_stmt drop_resource_stmt alter_resource_stmt %type <node> create_resource_stmt drop_resource_stmt alter_resource_stmt
%type <node> cur_timestamp_func cur_time_func cur_date_func now_synonyms_func utc_timestamp_func utc_time_func utc_date_func sys_interval_func sysdate_func %type <node> cur_timestamp_func cur_time_func cur_date_func now_synonyms_func utc_timestamp_func utc_time_func utc_date_func sys_interval_func sysdate_func cur_user_func
%type <node> create_dblink_stmt drop_dblink_stmt dblink tenant opt_cluster opt_dblink %type <node> create_dblink_stmt drop_dblink_stmt dblink tenant opt_cluster opt_dblink
%type <node> opt_create_resource_pool_option_list create_resource_pool_option alter_resource_pool_option_list alter_resource_pool_option %type <node> opt_create_resource_pool_option_list create_resource_pool_option alter_resource_pool_option_list alter_resource_pool_option
%type <node> opt_shrink_unit_option id_list opt_shrink_tenant_unit_option %type <node> opt_shrink_unit_option id_list opt_shrink_tenant_unit_option
@ -2434,6 +2434,10 @@ MOD '(' expr ',' expr ')'
{ {
$$ = $1; $$ = $1;
} }
| cur_user_func
{
$$ = $1;
}
| cur_date_func | cur_date_func
{ {
$$ = $1; $$ = $1;
@ -3077,6 +3081,17 @@ CURTIME '(' ')'
} }
; ;
cur_user_func:
CURRENT_USER
{
malloc_non_terminal_node($$, result->malloc_pool_, T_FUN_SYS_CURRENT_USER, 1, NULL);
}
| CURRENT_USER '(' ')'
{
malloc_non_terminal_node($$, result->malloc_pool_, T_FUN_SYS_CURRENT_USER, 1, NULL);
}
;
cur_date_func: cur_date_func:
CURDATE '(' ')' CURDATE '(' ')'
{ {
@ -17535,10 +17550,6 @@ NAME_OB
{ {
make_name_node($$, result->malloc_pool_, "right"); make_name_node($$, result->malloc_pool_, "right");
} }
| CURRENT_USER
{
make_name_node($$, result->malloc_pool_, "current_user");
}
| SYSTEM_USER | SYSTEM_USER
{ {
make_name_node($$, result->malloc_pool_, "user"); make_name_node($$, result->malloc_pool_, "user");

10
src/sql/resolver/expr/ob_raw_expr_resolver_impl.cpp
View File

@ -882,6 +882,16 @@ int ObRawExprResolverImpl::do_recursive_resolve(const ParseNode *node, ObRawExpr
} }
break; break;
} }
case T_FUN_SYS_CURRENT_USER: {
ObSysFunRawExpr *f_expr = NULL;
if (OB_FAIL(ctx_.expr_factory_.create_raw_expr(T_FUN_SYS_CURRENT_USER, f_expr))) {
LOG_WARN("fail to create raw expr", K(ret));
} else {
f_expr->set_func_name(ObString::make_string(N_CURRENT_USER));
expr = f_expr;
}
break;
}
case T_COLLATION: { case T_COLLATION: {
// used in internal function `set_collation' to implement COLLATE clause // used in internal function `set_collation' to implement COLLATE clause
if (OB_FAIL(process_collation_node(node, expr))) { if (OB_FAIL(process_collation_node(node, expr))) {