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

[CP] [to #2024082000104192277] fix: fix routine DDL printing when SQL_MODE='ORACLE'

Browse Source
This commit is contained in:
0xacc 2024-08-26 03:48:14 +00:00 committed by ob-robot
parent 42f1e479c9
commit e410ec98ee
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/observer/virtual_table/ob_mysql_proc_table.cpp
View File

@ -416,7 +416,9 @@ int ObMySQLProcTable::extract_create_node_from_routine_info(ObIAllocator &alloc,
ParseResult parse_result;
ObString routine_stmt;
pl::ObPLParser parser(alloc, sql::ObCharsets4Parser(), exec_env.get_sql_mode());
ObSQLMode sql_mode = exec_env.get_sql_mode();
sql_mode &= ~SMO_ORACLE;
pl::ObPLParser parser(alloc, sql::ObCharsets4Parser(), sql_mode);
const ObString &routine_body = routine_info.get_routine_body();
const char prefix[] = "CREATE\n";
int64_t prefix_len = STRLEN(prefix);

9
src/share/schema/ob_schema_printer.cpp
View File

@ -4459,8 +4459,7 @@ int ObSchemaPrinter::print_routine_definition(
} else if (routine_info->get_routine_body().prefix_match_ci("procedure")
|| routine_info->get_routine_body().prefix_match_ci("function")) {
use_v1 = false;
pl::ObPLParser parser(allocator, ObCharsets4Parser(), exec_env.get_sql_mode());
ObSQLMode sql_mode = exec_env.get_sql_mode();
if (lib::is_mysql_mode()) {
const char prefix[] = "CREATE\n";
@ -4475,13 +4474,17 @@ int ObSchemaPrinter::print_routine_definition(
MEMCPY(stmt_buf + prefix_len, routine_body.ptr(), routine_body.length());
routine_stmt.assign_ptr(stmt_buf, buf_sz);
sql_mode &= ~SMO_ORACLE;
}
} else { // oracle mode
routine_stmt = routine_body;
}
CK(!routine_stmt.empty());
OZ (parser.parse(routine_stmt, routine_stmt, parse_result, true));
if (OB_SUCC(ret)) {
pl::ObPLParser parser(allocator, ObCharsets4Parser(), sql_mode);
OZ (parser.parse(routine_stmt, routine_stmt, parse_result, true));
}
}
if (OB_SUCC(ret) && !use_v1) {