Commit 7517d7e1 authored by unknown's avatar unknown
Browse files

Implementation of WL#2486 - 

"Process NATURAL and USING joins according to SQL:2003".

* Some of the main problems fixed by the patch:
  - in "select *" queries the * expanded correctly according to
    ANSI for arbitrary natural/using joins
  - natural/using joins are correctly transformed into JOIN ... ON
    for any number/nesting of the joins.
  - column references are correctly resolved against natural joins
    of any nesting and combined with arbitrary other joins.

* This patch also contains a fix for name resolution of items
  inside the ON condition of JOIN ... ON - in this case items must
  be resolved only against the JOIN operands. To support such
  'local' name resolution, the patch introduces a stack of
  name resolution contexts used at parse time.

NOTICE:
- This patch is not complete in the sense that
  - there are 2 test cases that still do not pass -
    one in join.test, one in select.test. Both are marked
    with a comment "TODO: WL#2486".
  - it does not include a new test specific for the task


mysql-test/include/ps_query.inc:
  Adjusted according to standard NATURAL/USING join semantics.,
mysql-test/r/bdb.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/derived.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/errors.result:
  The column as a whole cannot be resolved, so different error message.
mysql-test/r/fulltext.result:
  Adjusted according to standard JOIN ... ON semantics =>
  the ON condition can refer only to the join operands.
mysql-test/r/fulltext_order_by.result:
  More detailed error message.
mysql-test/r/innodb.result:
  Adjusted according to standard NATURAL/USING join semantics.
  This test doesn't pass completetly yet!
mysql-test/r/insert_select.result:
  More detailed error message.
mysql-test/r/join.result:
  Adjusted according to standard NATURAL/USING join semantics.
  
  NOTICE: there is one test case that still fails, and it is
  commeted out and marked with WL#2486 in the test file.
mysql-test/r/join_crash.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/join_nested.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/join_outer.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/multi_update.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/null_key.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/order_by.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/ps_2myisam.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/ps_3innodb.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/ps_4heap.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/ps_5merge.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/ps_6bdb.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/ps_7ndb.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/select.result:
  Adjusted according to standard NATURAL/USING join semantics.
  
  NOTICE: there is one failing test case which is commented with
  WL#2486 in the test file.
mysql-test/r/subselect.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/type_ranges.result:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/r/union.result:
  More detailed error message.
mysql-test/t/bdb.test:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/errors.test:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/fulltext.test:
  Adjusted according to standard JOIN ... ON semantics =>
  the ON condition can refer only to the join operands.
mysql-test/t/fulltext_order_by.test:
  More detailed error message.
mysql-test/t/innodb.test:
  Adjusted according to standard NATURAL/USING join semantics.
  This test doesn't pass completetly yet!
mysql-test/t/insert_select.test:
  More detailed error message.
mysql-test/t/join.test:
  Adjusted according to standard NATURAL/USING join semantics.
  
  NOTICE: there is one test case that still fails, and it is
  commeted out and marked with WL#2486 in the test file.
mysql-test/t/join_crash.test:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/join_nested.test:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/join_outer.test:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/null_key.test:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/order_by.test:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/select.test:
  Adjusted according to standard NATURAL/USING join semantics.
  
  NOTICE: there is one test case that still fails, and it is
  commeted out and marked with WL#2486 in the test file.
mysql-test/t/subselect.test:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/type_ranges.test:
  Adjusted according to standard NATURAL/USING join semantics.
mysql-test/t/union.test:
  More detailed error message.
sql/item.cc:
  - extra parameter to find_field_in_tables
  - find_field_in_real_table renamed to find_field_in_table
  - fixed comments/typos
sql/item.h:
  - added [first | last]_name_resolution_table to class
    Name_resolution_context
  - commented old code
  - standardized formatting
sql/mysql_priv.h:
  - refactored the find_field_in_XXX procedures,
  - added a new procedure for natural join table references,
  - renamed the find_field_in_XXX procedures to clearer names
sql/sp.cc:
  - pass the top-most list of the FROM clause to setup_tables
  - extra parameter to find_field_in_tables
sql/sql_acl.cc:
  - renamed find_field_in_table => find_field_in_table_ref
  - extra parameter to find_field_in_table_ref
  - commented old code
sql/sql_base.cc:
  This file contains the core of the implementation of the processing
  of NATURAL/USING joins (WL#2486).
  - added many comments to old code
  - refactored the group of find_field_in_XXX procedures, and added a
    new procedure for natural joins. There is one find_field_in_XXX procedure
    per each type of table reference (stored table, merge view, or natural
    join); one meta-procedure that selects the correct one depeneding on the
    table reference; and one procedure that goes over a list of table
    referenes.
  - NATURAL/USING joins are processed through the procedures:
      mark_common_columns, store_natural_using_join_columns,
      store_top_level_join_columns, setup_natural_join_row_types.
    The entry point to processing NATURAL/USING joins is the
    procedure 'setup_natural_join_row_types'.
  - Replaced the specialized Field_iterator_XXX iterators with one
    generic iterator over the fields of a table reference.
  - Simplified 'insert_fields' and 'setup_conds' due to encapsulation of
    the processing of natural joins in a separate set of procedures.
sql/sql_class.h:
  - Commented old code.
sql/sql_delete.cc:
  - Pass the FROM clause to setup_tables.
sql/sql_help.cc:
  - pass the end name resolution table to find_field_in_tables
  - adjust the list of tables for name resolution
sql/sql_insert.cc:
  - Changed the code that saves and restores the current context to
    support the list of tables for name resolution -
    context->first_name_resolution_table, and
    table_list->next_name_resolution_table.
    Needed to support an ugly trick to resolve inserted columns only in
    the first table.
  - Added Name_resolution_context::[first | last]_name_resolution_table.
  - Commented old code
sql/sql_lex.cc:
  - set select_lex.parent_lex correctly
  - set correct state of the current name resolution context
sql/sql_lex.h:
  - Added a stack of name resolution contexts to support local
    contexts for JOIN ... ON conditions.
  - Commented old code.
sql/sql_load.cc:
  - Pass the FROM clause to setup_tables.
sql/sql_olap.cc:
  - Pass the FROM clause to setup_tables.
sql/sql_parse.cc:
  - correctly set SELECT_LEX::parent_lex
  - set the first table of the current name resoltion context
  - added support for NATURAL/USING joins
  - commented old code
sql/sql_select.cc:
  - Pass the FROM clause to setup_tables.
  - Pass the end table to find_field_in_tables
  - Improved comments
sql/sql_show.cc:
  - Set SELECT_LEX::parent_lex.
sql/sql_update.cc:
  - Pass the FROM clause to setup_tables.
sql/sql_yacc.yy:
  - Added support for a stack of name resolution contexts needed to
    implement name resolution for JOIN ... ON. A context is pushed
    for each new JOIN ... ON, and popped afterwards.
  - Added support for NATURAL/USING joins.
sql/table.cc:
  - Added new class Natural_join_column to hide the heterogeneous
    representation of column references for stored tables and for
    views.
  - Added a new list TABLE_LIST::next_name_resolution_table to
    support name resolution with NATURAL/USING joins. Also added
    other members to TABLE_LIST to support NATURAL/USING joins.
  - Added a generic iterator over the fields of table references
    of various types - class Field_iterator_table_ref
sql/table.h:
  - Added new class Natural_join_column to hide the heterogeneous
    representation of column references for stored tables and for
    views.
  - Added a new list TABLE_LIST::next_name_resolution_table to
    support name resolution with NATURAL/USING joins. Also added
    other members to TABLE_LIST to support NATURAL/USING joins.
  - Added a generic iterator over the fields of table references
    of various types - class Field_iterator_table_ref
tests/mysql_client_test.c:
  Adjusted according to standard NATURAL JOIN syntax.
parent 6eb7a80a

mysql-test/include/ps_query.inc

+6 −6
Original line number Diff line number Diff line
@@ -349,14 +349,14 @@ drop table if exists t2 ; 
--enable_warnings

create table t2 as select * from t1 ;

set @query1= 'SELECT * FROM t2 join t1 on (t1.a=t2.a) order by t2.a ' ;

set @query2= 'SELECT * FROM t2 natural join t1 order by t2.a ' ;

set @query3= 'SELECT * FROM t2 join t1 using(a) order by t2.a ' ;

set @query2= 'SELECT * FROM t2 natural join t1 order by a ' ;

set @query3= 'SELECT * FROM t2 join t1 using(a) order by a ' ;

set @query4= 'SELECT * FROM t2 left join t1 on(t1.a=t2.a) order by t2.a ' ;

set @query5= 'SELECT * FROM t2 natural left join t1 order by t2.a ' ;

set @query6= 'SELECT * FROM t2 left join t1 using(a) order by t2.a ' ;

set @query5= 'SELECT * FROM t2 natural left join t1 order by a ' ;

set @query6= 'SELECT * FROM t2 left join t1 using(a) order by a ' ;

set @query7= 'SELECT * FROM t2 right join t1 on(t1.a=t2.a) order by t2.a ' ;

set @query8= 'SELECT * FROM t2 natural right join t1 order by t2.a ' ;

set @query9= 'SELECT * FROM t2 right join t1 using(a) order by t2.a ' ;

set @query8= 'SELECT * FROM t2 natural right join t1 order by a ' ;

set @query9= 'SELECT * FROM t2 right join t1 using(a) order by a ' ;

let $1= 9 ;

while ($1)

{

mysql-test/r/bdb.result

+2 −2
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ drop table t1; 
set @a:=now();

CREATE TABLE t1 (a int not null, b timestamp not null, primary key (a)) engine=bdb;

insert into t1 (a) values(1),(2),(3);

select t1.a from t1 natural join t1 as t2 where t1.b >= @a order by t1.a;

select a from t1 natural join t1 as t2 where b >= @a order by a;

a

1

2
@@ -906,7 +906,7 @@ create temporary table tmp1 
select branch_id, target_id, platform_id, product_id

from t1, t2, t3, t4 ;

create temporary table tmp2 

select tmp1.branch_id, tmp1.target_id, tmp1.platform_id, tmp1.product_id 

select branch_id, target_id, platform_id, product_id 

from tmp1 left join t8 

using (branch_id,target_id,platform_id,product_id) 

where t8.archive_id is null ;

mysql-test/r/derived.result

+2 −2
Original line number Diff line number Diff line
@@ -149,8 +149,8 @@ SELECT * FROM (SELECT (SELECT * FROM (SELECT 1 as a) as a )) as b; 
(SELECT * FROM (SELECT 1 as a) as a )

1

select * from (select 1 as a) b  left join (select 2 as a) c using(a);

a	a

1	NULL

a

1

SELECT * FROM (SELECT 1 UNION SELECT a) b;

ERROR 42S22: Unknown column 'a' in 'field list'

SELECT 1 as a FROM (SELECT a UNION SELECT 1) b;

mysql-test/r/errors.result

+2 −2
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ create table t1 (a int); 
select count(test.t1.b) from t1;

ERROR 42S22: Unknown column 'test.t1.b' in 'field list'

select count(not_existing_database.t1) from t1;

ERROR 42S02: Unknown table 'not_existing_database' in field list

ERROR 42S22: Unknown column 'not_existing_database.t1' in 'field list'

select count(not_existing_database.t1.a) from t1;

ERROR 42S02: Unknown table 'not_existing_database.t1' in field list

ERROR 42S22: Unknown column 'not_existing_database.t1.a' in 'field list'

select count(not_existing_database.t1.a) from not_existing_database.t1;

Got one of the listed errors

select 1 from t1 order by 2;

mysql-test/r/fulltext.result

+8 −8
Original line number Diff line number Diff line
@@ -221,14 +221,14 @@ select t1.id FROM t2 as ttxt,t1,t1 as ticket2 
WHERE ticket2.id = ttxt.ticket AND t1.id = ticket2.ticket and

match(ttxt.inhalt) against ('foobar');

id

select t1.id FROM t2 as ttxt,t1 INNER JOIN t1 as ticket2 ON

ticket2.id = ttxt.ticket

WHERE t1.id = ticket2.ticket and match(ttxt.inhalt) against ('foobar');

select ticket2.id FROM t2 as ttxt,t2 INNER JOIN t1 as ticket2 ON

ticket2.id = t2.ticket

WHERE ticket2.id = ticket2.ticket and match(ttxt.inhalt) against ('foobar');

id

INSERT INTO t1 VALUES (3,3);

select t1.id FROM t2 as ttxt,t1

INNER JOIN t1 as ticket2 ON ticket2.id = ttxt.ticket

WHERE t1.id = ticket2.ticket and

select ticket2.id FROM t2 as ttxt,t2

INNER JOIN t1 as ticket2 ON ticket2.id = t2.ticket

WHERE ticket2.id = ticket2.ticket and

match(ttxt.inhalt) against ('foobar');

id

3
@@ -337,8 +337,8 @@ insert into t2 values (1, 1, 'xxfoo'); 
insert into t2 values (2, 1, 'xxbar');

insert into t2 values (3, 1, 'xxbuz');

select * from t1 join t2 using(`t1_id`) where match (t1.name, t2.name) against('xxfoo' in boolean mode);

t1_id	name	t2_id	t1_id	name

1	data1	1	1	xxfoo

t1_id	name	t2_id	name

1	data1	1	xxfoo

select * from t2 where match name against ('*a*b*c*d*e*f*' in boolean mode);

t2_id	t1_id	name

drop table t1,t2;