提交 4acae240 编写于 作者: W wangt1xiuyi 提交者: wangzelin.wzl

support full non_reserved_word can be as alias name

上级 6e9e639a
...@@ -30,4 +30,4 @@ flex -Cfa -B -8 -o ../../../src/sql/parser/sql_parser_mysql_mode_lex.c ../../../ ...@@ -30,4 +30,4 @@ flex -Cfa -B -8 -o ../../../src/sql/parser/sql_parser_mysql_mode_lex.c ../../../
sed "/Setup the input buffer state to scan the given bytes/,/}/{/int i/d}" -i sql_parser_mysql_mode_lex.c sed "/Setup the input buffer state to scan the given bytes/,/}/{/int i/d}" -i sql_parser_mysql_mode_lex.c
sed "/Setup the input buffer state to scan the given bytes/,/}/{/for ( i = 0; i < _yybytes_len; ++i )/d}" -i sql_parser_mysql_mode_lex.c sed "/Setup the input buffer state to scan the given bytes/,/}/{/for ( i = 0; i < _yybytes_len; ++i )/d}" -i sql_parser_mysql_mode_lex.c
sed "/Setup the input buffer state to scan the given bytes/,/}/{s/\tbuf\[i\] = yybytes\[i\]/memcpy(buf, yybytes, _yybytes_len)/g}" -i sql_parser_mysql_mode_lex.c sed "/Setup the input buffer state to scan the given bytes/,/}/{s/\tbuf\[i\] = yybytes\[i\]/memcpy(buf, yybytes, _yybytes_len)/g}" -i sql_parser_mysql_mode_lex.c
sed "/YY_EXIT_FAILURE/,/}/{s/yyconst char\* msg , yyscan_t yyscanner/yyconst char* msg , yyscan_t yyscanner __attribute__((unused))/g}" -i sql_parser_mysql_mode_lex.c sed "/YY_EXIT_FAILURE/,/}/{s/yyconst char\* msg , yyscan_t yyscanner/yyconst char* msg , yyscan_t yyscanner __attribute__((unused))/g}" -i sql_parser_mysql_mode_lex.c
\ No newline at end of file
...@@ -343,7 +343,7 @@ END_P SET_VAR DELIMITER ...@@ -343,7 +343,7 @@ END_P SET_VAR DELIMITER
%type <node> index_hint_definition index_hint_list %type <node> index_hint_definition index_hint_list
%type <node> tracing_num_list %type <node> tracing_num_list
%type <node> qb_name_option %type <node> qb_name_option
%type <node> join_condition inner_join_type opt_inner outer_join_type opt_outer natural_join_type %type <node> join_condition inner_join_type opt_inner outer_join_type opt_outer natural_join_type except_full_outer_join_type opt_full_table_factor
%type <ival> string_length_i opt_string_length_i opt_string_length_i_v2 opt_int_length_i opt_bit_length_i opt_datetime_fsp_i opt_unsigned_i opt_zerofill_i opt_year_i opt_time_func_fsp_i %type <ival> string_length_i opt_string_length_i opt_string_length_i_v2 opt_int_length_i opt_bit_length_i opt_datetime_fsp_i opt_unsigned_i opt_zerofill_i opt_year_i opt_time_func_fsp_i
%type <node> opt_float_precision opt_number_precision %type <node> opt_float_precision opt_number_precision
%type <node> opt_equal_mark opt_default_mark read_only_or_write not not2 opt_disk_alias %type <node> opt_equal_mark opt_default_mark read_only_or_write not not2 opt_disk_alias
...@@ -8692,29 +8692,67 @@ joined_table: ...@@ -8692,29 +8692,67 @@ joined_table:
/** /**
* ref: https://dev.mysql.com/doc/refman/8.0/en/join.html * ref: https://dev.mysql.com/doc/refman/8.0/en/join.html
*/ */
table_reference inner_join_type table_factor %prec LOWER_ON table_reference inner_join_type opt_full_table_factor %prec LOWER_ON
{ {
JOIN_MERGE_NODES($1, $3); JOIN_MERGE_NODES($1, $3);
malloc_non_terminal_node($$, result->malloc_pool_, T_JOINED_TABLE, 5, $2, $1, $3, NULL, NULL); malloc_non_terminal_node($$, result->malloc_pool_, T_JOINED_TABLE, 5, $2, $1, $3, NULL, NULL);
} }
| table_reference inner_join_type table_factor ON expr | table_reference inner_join_type opt_full_table_factor ON expr
{ {
JOIN_MERGE_NODES($1, $3); JOIN_MERGE_NODES($1, $3);
malloc_non_terminal_node($$, result->malloc_pool_, T_JOINED_TABLE, 5, $2, $1, $3, $5, NULL); malloc_non_terminal_node($$, result->malloc_pool_, T_JOINED_TABLE, 5, $2, $1, $3, $5, NULL);
} }
| table_reference inner_join_type table_factor USING '(' column_list ')' | table_reference inner_join_type opt_full_table_factor USING '(' column_list ')'
{ {
JOIN_MERGE_NODES($1, $3); JOIN_MERGE_NODES($1, $3);
ParseNode *condition_node = NULL; ParseNode *condition_node = NULL;
merge_nodes(condition_node, result, T_COLUMN_LIST, $6); merge_nodes(condition_node, result, T_COLUMN_LIST, $6);
malloc_non_terminal_node($$, result->malloc_pool_, T_JOINED_TABLE, 5, $2, $1, $3, condition_node, NULL); malloc_non_terminal_node($$, result->malloc_pool_, T_JOINED_TABLE, 5, $2, $1, $3, condition_node, NULL);
} }
| table_reference outer_join_type table_factor join_condition | table_reference except_full_outer_join_type opt_full_table_factor join_condition
{ {
JOIN_MERGE_NODES($1, $3); JOIN_MERGE_NODES($1, $3);
malloc_non_terminal_node($$, result->malloc_pool_, T_JOINED_TABLE, 5, $2, $1, $3, $4, NULL); malloc_non_terminal_node($$, result->malloc_pool_, T_JOINED_TABLE, 5, $2, $1, $3, $4, NULL);
} }
| table_reference natural_join_type table_factor | table_reference FULL JOIN opt_full_table_factor join_condition
{
JOIN_MERGE_NODES($1, $4);
malloc_terminal_node($$, result->malloc_pool_, T_JOIN_FULL);
malloc_non_terminal_node($$, result->malloc_pool_, T_JOINED_TABLE, 5, $$, $1, $4, $5, NULL);
}
| table_reference FULL OUTER JOIN opt_full_table_factor join_condition
{
JOIN_MERGE_NODES($1, $5);
malloc_terminal_node($$, result->malloc_pool_, T_JOIN_FULL);
malloc_non_terminal_node($$, result->malloc_pool_, T_JOINED_TABLE, 5, $$, $1, $5, $6, NULL);
}
| table_reference FULL %prec LOWER_COMMA
{
if ($1->type_ == T_ORG) {
ParseNode *name_node = NULL;
make_name_node(name_node, result->malloc_pool_, "full");
malloc_non_terminal_node($$, result->malloc_pool_, T_ALIAS, $1->num_child_ + 1);
for (int i = 0; i <= $1->num_child_; ++i) {
if (i == 0) {
$$->children_[i] = $1->children_[i];
} else if (i == 1) {
$$->children_[i] = name_node;
} else {
$$->children_[i] = $1->children_[i - 1];
}
}
} else if ($1->type_ == T_ALIAS && $1->children_[1] != NULL &&
strlen($1->children_[1]->str_value_) == 0) {
ParseNode *name_node = NULL;
make_name_node(name_node, result->malloc_pool_, "full");
$1->children_[1] = name_node;
$$ = $1;
} else {
yyerror(&@2, result, "occur multi alias name\n");
YYERROR;
}
}
| table_reference natural_join_type opt_full_table_factor
{ {
JOIN_MERGE_NODES($1, $3); JOIN_MERGE_NODES($1, $3);
...@@ -8725,6 +8763,39 @@ table_reference inner_join_type table_factor %prec LOWER_ON ...@@ -8725,6 +8763,39 @@ table_reference inner_join_type table_factor %prec LOWER_ON
} }
; ;
opt_full_table_factor:
table_factor %prec LOWER_COMMA
{
$$ = $1;
}
| table_factor FULL
{
if ($1->type_ == T_ORG) {
ParseNode *name_node = NULL;
make_name_node(name_node, result->malloc_pool_, "full");
malloc_non_terminal_node($$, result->malloc_pool_, T_ALIAS, $1->num_child_ + 1);
for (int i = 0; i <= $1->num_child_; ++i) {
if (i == 0) {
$$->children_[i] = $1->children_[i];
} else if (i == 1) {
$$->children_[i] = name_node;
} else {
$$->children_[i] = $1->children_[i - 1];
}
}
} else if ($1->type_ == T_ALIAS && $1->children_[1] != NULL &&
strlen($1->children_[1]->str_value_) == 0) {
ParseNode *name_node = NULL;
make_name_node(name_node, result->malloc_pool_, "full");
$1->children_[1] = name_node;
$$ = $1;
} else {
yyerror(&@2, result, "occur multi alias name\n");
YYERROR;
}
}
;
natural_join_type: natural_join_type:
NATURAL outer_join_type NATURAL outer_join_type
{ {
...@@ -8778,6 +8849,22 @@ FULL opt_outer JOIN ...@@ -8778,6 +8849,22 @@ FULL opt_outer JOIN
} }
; ;
except_full_outer_join_type:
LEFT opt_outer JOIN
{
/* make bison mute */
(void)($2);
malloc_terminal_node($$, result->malloc_pool_, T_JOIN_LEFT);
}
| RIGHT opt_outer JOIN
{
/* make bison mute */
(void)($2);
malloc_terminal_node($$, result->malloc_pool_, T_JOIN_RIGHT);
}
;
opt_outer: opt_outer:
OUTER { $$ = NULL; } OUTER { $$ = NULL; }
| /* EMPTY */ { $$ = NULL; } | /* EMPTY */ { $$ = NULL; }
......
因为 它太大了无法显示 source diff 。你可以改为 查看blob
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册