1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-10078 sql_yacc.yy: Remove non-parenthesized SELECT from table_factor

Browse Source
This commit is contained in:
Alexander Barkov 2016-05-17 09:58:45 +04:00
parent a742f8e06b
commit c322e3fb4c
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
sql/sql_yacc.yy
View File

@ -1878,7 +1878,8 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
%type <table_list> %type <table_list>
join_table_list join_table join_table_list join_table
table_factor table_ref esc_table_ref table_factor table_ref_select table_ref esc_table_ref
table_primary_ident table_primary_derived
select_derived derived_table_list select_derived derived_table_list
select_derived_union select_derived_union
@ -10766,7 +10767,8 @@ when_list:
/* Equivalent to <table reference> in the SQL:2003 standard. */ /* Equivalent to <table reference> in the SQL:2003 standard. */
/* Warning - may return NULL in case of incomplete SELECT */ /* Warning - may return NULL in case of incomplete SELECT */
table_ref: table_ref:
table_factor { $$=$1; } table_factor { $$= $1; }
| table_ref_select { $$= $1; }
| join_table | join_table
{ {
LEX *lex= Lex; LEX *lex= Lex;
@ -10967,6 +10969,11 @@ use_partition:
*/ */
/* Warning - may return NULL in case of incomplete SELECT */ /* Warning - may return NULL in case of incomplete SELECT */
table_factor: table_factor:
table_primary_ident
| table_primary_derived
;
table_primary_ident:
{ {
SELECT_LEX *sel= Select; SELECT_LEX *sel= Select;
sel->table_join_options= 0; sel->table_join_options= 0;
@ -10982,7 +10989,10 @@ table_factor:
MYSQL_YYABORT; MYSQL_YYABORT;
Select->add_joined_table($$); Select->add_joined_table($$);
} }
| select_derived_init get_select_lex select_derived2 ;
table_ref_select:
select_derived_init get_select_lex select_derived2
{ {
LEX *lex= Lex; LEX *lex= Lex;
SELECT_LEX *sel= lex->current_select; SELECT_LEX *sel= lex->current_select;
@ -11000,25 +11010,27 @@ table_factor:
/* incomplete derived tables return NULL, we must be /* incomplete derived tables return NULL, we must be
nested in select_derived rule to be here. */ nested in select_derived rule to be here. */
} }
/* ;
Represents a flattening of the following rules from the SQL:2003
standard. This sub-rule corresponds to the sub-rule
<table primary> ::= ... | <derived table> [ AS ] <correlation name>
The following rules have been flattened into query_expression_body
(since we have no <with clause>).
<derived table> ::= <table subquery>
<table subquery> ::= <subquery>
<subquery> ::= <left paren> <query expression> <right paren>
<query expression> ::= [ <with clause> ] <query expression body>
For the time being we use the non-standard rule /*
select_derived_union which is a compromise between the standard Represents a flattening of the following rules from the SQL:2003
and our parser. Possibly this rule could be replaced by our standard. This sub-rule corresponds to the sub-rule
query_expression_body. <table primary> ::= ... | <derived table> [ AS ] <correlation name>
*/
| '(' get_select_lex select_derived_union ')' opt_table_alias <derived table> ::= <table subquery>
<table subquery> ::= <subquery>
<subquery> ::= <left paren> <query expression> <right paren>
<query expression> ::= [ <with clause> ] <query expression body>
For the time being we use the non-standard rule
select_derived_union which is a compromise between the standard
and our parser. Possibly this rule could be replaced by our
query_expression_body.
*/
table_primary_derived:
'(' get_select_lex select_derived_union ')' opt_table_alias
{ {
/* Use $2 instead of Lex->current_select as derived table will /* Use $2 instead of Lex->current_select as derived table will
alter value of Lex->current_select. */ alter value of Lex->current_select. */
@ -11097,7 +11109,6 @@ table_factor:
if (!($$= sel->add_table_to_list(lex->thd, if (!($$= sel->add_table_to_list(lex->thd,
ti, $8, 0, ti, $8, 0,
TL_READ, MDL_SHARED_READ))) TL_READ, MDL_SHARED_READ)))
MYSQL_YYABORT; MYSQL_YYABORT;
sel->add_joined_table($$); sel->add_joined_table($$);
} }