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

[CP] to issue<50460594>:fix get diagnostic issue

Browse Source
This commit is contained in:
obdev
2023-09-08 12:16:05 +08:00
committed by ob-robot
parent ac4581cdd7
commit 8194d7657a
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sql/ob_sql.cpp
View File

@ -1031,7 +1031,9 @@ int ObSql::do_real_prepare(const ObString &sql,
} else if (OB_FAIL(parser.parse(sql, } else if (OB_FAIL(parser.parse(sql,
parse_result, parse_result,
parse_mode, parse_mode,
false/*is_batched_multi_stmt_split_on*/))) { false/*is_batched_multi_stmt_split_on*/,
false/*no_throw_parser_error*/,
is_from_pl))) {
LOG_WARN("generate syntax tree failed", K(sql), K(ret)); LOG_WARN("generate syntax tree failed", K(sql), K(ret));
} else if (is_mysql_mode() } else if (is_mysql_mode()
&& ObSQLUtils::is_mysql_ps_not_support_stmt(parse_result)) { && ObSQLUtils::is_mysql_ps_not_support_stmt(parse_result)) {
@ -2210,7 +2212,7 @@ int ObSql::handle_ps_execute(const ObPsStmtId client_stmt_id,
ParseMode parse_mode = context.is_dbms_sql_ ? DBMS_SQL_MODE : ParseMode parse_mode = context.is_dbms_sql_ ? DBMS_SQL_MODE :
context.is_dynamic_sql_ ? DYNAMIC_SQL_MODE : context.is_dynamic_sql_ ? DYNAMIC_SQL_MODE :
(context.session_info_->is_for_trigger_package() ? TRIGGER_MODE : STD_MODE); (context.session_info_->is_for_trigger_package() ? TRIGGER_MODE : STD_MODE);
if (OB_FAIL(parser.parse(sql, parse_result, parse_mode))) { if (OB_FAIL(parser.parse(sql, parse_result, parse_mode, false, false, NULL != session.get_pl_context()))) {
LOG_WARN("failed to parse sql", K(ret), K(sql), K(stmt_type)); LOG_WARN("failed to parse sql", K(ret), K(sql), K(stmt_type));
} else if (OB_FAIL(check_read_only_privilege(parse_result, ectx, *schema_guard, sql_traits))) { } else if (OB_FAIL(check_read_only_privilege(parse_result, ectx, *schema_guard, sql_traits))) {
LOG_WARN("failed to check read only privilege", K(ret)); LOG_WARN("failed to check read only privilege", K(ret));
@ -4080,7 +4082,8 @@ int ObSql::parser_and_check(const ObString &outlined_stmt,
ObParser parser(allocator, session->get_sql_mode(), session->get_local_collation_connection(), pc_ctx.def_name_ctx_); ObParser parser(allocator, session->get_sql_mode(), session->get_local_collation_connection(), pc_ctx.def_name_ctx_);
if (OB_FAIL(parser.parse(outlined_stmt, parse_result, if (OB_FAIL(parser.parse(outlined_stmt, parse_result,
pc_ctx.is_rewrite_sql_ ? UDR_SQL_MODE : STD_MODE, pc_ctx.is_rewrite_sql_ ? UDR_SQL_MODE : STD_MODE,
pc_ctx.sql_ctx_.handle_batched_multi_stmt()))) { pc_ctx.sql_ctx_.handle_batched_multi_stmt(),
false, NULL != session->get_pl_context()))) {
LOG_WARN("Generate syntax tree failed", K(outlined_stmt), K(ret)); LOG_WARN("Generate syntax tree failed", K(outlined_stmt), K(ret));
} else if ((PC_PS_MODE == pc_ctx.mode_ || PC_PL_MODE == pc_ctx.mode_) } else if ((PC_PS_MODE == pc_ctx.mode_ || PC_PL_MODE == pc_ctx.mode_)
&& OB_FAIL(construct_param_store_from_parameterized_params( && OB_FAIL(construct_param_store_from_parameterized_params(

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

@ -11776,7 +11776,12 @@ INTNUM
| QUESTIONMARK | QUESTIONMARK
{ {
$$ = $1; $$ = $1;
if (result->pl_parse_info_.is_pl_parse_ || result->pl_parse_info_.is_inner_parse_) {
dup_string($$, result, @1.first_column + 1, @1.last_column); dup_string($$, result, @1.first_column + 1, @1.last_column);
} else {
yyerror(&@1, result, "question mark as condition arg not allowed\n");
YYABORT_PARSE_SQL_ERROR;
}
} }
| column_name | column_name
{ {