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

fix const number of fast parse and normal parse is different with mysql sql comment and parser error code refine

Browse Source
This commit is contained in:
wangt1xiuyi
2023-12-27 07:13:42 +00:00
committed by ob-robot
parent 53f4740004
commit abbc4fcab3
5 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/sql/parser/sql_parser_mysql_mode.l
View File

@ -135,6 +135,7 @@ NULL {
check_value(yylval);
ParseResult *p = (ParseResult *)yyextra;
malloc_new_node(yylval->node, p->malloc_pool_, T_NULL, 0);
CHECK_MYSQL_COMMENT(p, yylval->node);
COPY_STRING(p->input_sql_ + yylloc->first_column - 1, yyleng, yylval->node->raw_text_);
yylval->node->text_len_ = yyleng;
if (IS_FAST_PARAMETERIZE) {
@ -152,6 +153,7 @@ NULL {
ParseResult *p = (ParseResult *)yyextra;
malloc_new_node(node, p->malloc_pool_, T_INT, 0);
yylval->node = node;
CHECK_MYSQL_COMMENT(p, yylval->node);
int err_no = 0;
COPY_NUM_STRING(p, node);
// we treated '- 12' as a const node, that is to say node->str_value_ = '- 12'
@ -205,6 +207,7 @@ NULL {
malloc_new_node(node, p->malloc_pool_, T_DOUBLE, 0);
check_value(yylval);
yylval->node = node;
CHECK_MYSQL_COMMENT(p, yylval->node);
COPY_NUM_STRING(p, node);
node->raw_text_ = node->str_value_;
node->text_len_ = node->str_len_;
@ -224,6 +227,7 @@ NULL {
malloc_new_node(node, p->malloc_pool_, T_NUMBER/* should be T_NUMBER,*/, 0);
check_value(yylval);
yylval->node = node;
CHECK_MYSQL_COMMENT(p, yylval->node);
COPY_NUM_STRING(p, node);
node->raw_text_ = node->str_value_;
node->text_len_ = node->str_len_;
@ -240,6 +244,7 @@ TRUE {
check_value(yylval);
ParseResult *p = (ParseResult *)yyextra;
malloc_new_node(yylval->node, p->malloc_pool_, T_BOOL, 0);
CHECK_MYSQL_COMMENT(p, yylval->node);
yylval->node->value_ = 1;
COPY_STRING(p->input_sql_ + yylloc->first_column - 1, yyleng, yylval->node->raw_text_);
yylval->node->text_len_ = yyleng;
@ -265,6 +270,7 @@ FALSE {
check_value(yylval);
ParseResult *p = (ParseResult *)yyextra;
malloc_new_node(yylval->node, p->malloc_pool_, T_BOOL, 0);
CHECK_MYSQL_COMMENT(p, yylval->node);
yylval->node->value_ = 0;
COPY_STRING(p->input_sql_ + yylloc->first_column - 1, yyleng, yylval->node->raw_text_);
yylval->node->text_len_ = yyleng;
@ -298,6 +304,7 @@ FALSE {
}
check_value(yylval);
malloc_new_node(yylval->node, p->malloc_pool_, T_NCHAR, 0);
CHECK_MYSQL_COMMENT(p, yylval->node);
yylval->node->str_len_ = 0;
if (IS_FAST_PARAMETERIZE && !IS_NEED_PARAMETERIZE) {
@ -312,6 +319,7 @@ FALSE {
p->start_col_ = yylloc->first_column;
check_value(yylval);
malloc_new_node(yylval->node, p->malloc_pool_, T_VARCHAR, 0);
CHECK_MYSQL_COMMENT(p, yylval->node);
yylval->node->str_len_ = 0;
p->last_escape_check_pos_ = 0;
yylval->node->str_value_ = NULL;
@ -412,6 +420,7 @@ FALSE {
}
malloc_new_node(yylval->node->children_[0], p->malloc_pool_, T_CONCAT_STRING, 0);
CHECK_MYSQL_COMMENT(p, yylval->node->children_[0]);
(*yylval->node->children_)->str_value_ = parse_strndup(tmp_literal, yylval->node->str_len_ + 1,
p->malloc_pool_);
check_malloc((*yylval->node->children_)->str_value_);
@ -459,6 +468,7 @@ FALSE {
check_malloc(*tmp_literal);
}
malloc_new_node(yylval->node, p->malloc_pool_, T_VARCHAR, 0);
CHECK_MYSQL_COMMENT(p, yylval->node);
yylval->node->str_len_ = 0;
p->last_escape_check_pos_ = 0;
if (IS_FAST_PARAMETERIZE && !IS_NEED_PARAMETERIZE) {
@ -553,6 +563,7 @@ FALSE {
}
malloc_new_node(yylval->node->children_[0], p->malloc_pool_, T_CONCAT_STRING, 0);
CHECK_MYSQL_COMMENT(p, yylval->node->children_[0]);
(*yylval->node->children_)->str_value_ = parse_strndup(tmp_literal, yylval->node->str_len_ + 1,
p->malloc_pool_);
check_malloc((*yylval->node->children_)->str_value_);
@ -730,6 +741,7 @@ X'([0-9A-F])*'|0X([0-9A-F])+ {
node->str_len_ = 0;
}
yylval->node = node;
CHECK_MYSQL_COMMENT(p, yylval->node);
COPY_STRING(p->input_sql_ + yylloc->first_column - 1, yyleng, yylval->node->raw_text_);
yylval->node->text_len_ = yyleng;
yylval->node->is_copy_raw_text_ = 1;
@ -773,6 +785,7 @@ B'([01])*'|0B([01])+ {
node->str_len_ = 0;
}
yylval->node = node;
CHECK_MYSQL_COMMENT(p, yylval->node);
COPY_STRING(p->input_sql_ + yylloc->first_column - 1, yyleng, yylval->node->raw_text_);
yylval->node->text_len_ = yyleng;
yylval->node->is_copy_raw_text_ = 1;