Changeset: b567ef55eac7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b567ef55eac7 Added Files: sql/test/BugTracker-2014/Tests/outer_join_using_diff_types_using.Bug-3536.sql sql/test/BugTracker-2014/Tests/outer_join_using_diff_types_using.Bug-3536.stable.err sql/test/BugTracker-2014/Tests/outer_join_using_diff_types_using.Bug-3536.stable.out Modified Files: sql/server/rel_select.c sql/test/BugTracker-2014/Tests/All Branch: Jan2014 Log Message:
fixed bug 3536, ie handle different types in using and outer joins diffs (131 lines): diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c --- a/sql/server/rel_select.c +++ b/sql/server/rel_select.c @@ -5383,8 +5383,12 @@ rel_joinquery_(mvc *sql, sql_rel *rel, s return NULL; } rel = rel_compare_exp(sql, rel, ls, rs, "=", NULL, TRUE); - cond = rel_unop_(sql, ls, NULL, "isnull", card_value); - ls = rel_nop_(sql, cond, rs, ls, NULL, NULL, "ifthenelse", card_value); + if (op != op_join) { + cond = rel_unop_(sql, ls, NULL, "isnull", card_value); + if (rel_convert_types(sql, &ls, &rs, 1, type_equal) < 0) + return NULL; + ls = rel_nop_(sql, cond, rs, ls, NULL, NULL, "ifthenelse", card_value); + } exp_setname(sql->sa, ls, rnme, nm); append(outexps, ls); if (!rel) diff --git a/sql/test/BugTracker-2014/Tests/All b/sql/test/BugTracker-2014/Tests/All --- a/sql/test/BugTracker-2014/Tests/All +++ b/sql/test/BugTracker-2014/Tests/All @@ -29,3 +29,4 @@ union_with_subqueries.Bug-3518 unsafe_project_push_down.Bug-3523 non_groupby_column.Bug-3524 orderby_count.Bug-3526 +outer_join_using_diff_types_using.Bug-3536 diff --git a/sql/test/BugTracker-2014/Tests/outer_join_using_diff_types_using.Bug-3536.sql b/sql/test/BugTracker-2014/Tests/outer_join_using_diff_types_using.Bug-3536.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2014/Tests/outer_join_using_diff_types_using.Bug-3536.sql @@ -0,0 +1,9 @@ + +create table test_a (a integer); +create table test_b (a smallint); + +select * from test_a join test_b using (a); +select * from test_a left outer join test_b using (a); + +drop table test_a; +drop table test_b; diff --git a/sql/test/BugTracker-2014/Tests/outer_join_using_diff_types_using.Bug-3536.stable.err b/sql/test/BugTracker-2014/Tests/outer_join_using_diff_types_using.Bug-3536.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2014/Tests/outer_join_using_diff_types_using.Bug-3536.stable.err @@ -0,0 +1,35 @@ +stderr of test 'outer_join_using_diff_types_using.Bug-3536` in directory 'sql/test/BugTracker-2014` itself: + + +# 11:45:36 > +# 11:45:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31021" "--set" "mapi_usock=/var/tmp/mtest-13021/.s.monetdb.31021" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014" "--set" "mal_listing=0" +# 11:45:36 > + +# builtin opt gdk_dbpath = /home/niels/scratch/rc-clean/Linux-x86_64/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 31021 +# cmdline opt mapi_usock = /var/tmp/mtest-13021/.s.monetdb.31021 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014 +# cmdline opt mal_listing = 0 + +# 11:45:36 > +# 11:45:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-13021" "--port=31021" +# 11:45:36 > + + +# 11:45:36 > +# 11:45:36 > "Done." +# 11:45:36 > + diff --git a/sql/test/BugTracker-2014/Tests/outer_join_using_diff_types_using.Bug-3536.stable.out b/sql/test/BugTracker-2014/Tests/outer_join_using_diff_types_using.Bug-3536.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2014/Tests/outer_join_using_diff_types_using.Bug-3536.stable.out @@ -0,0 +1,46 @@ +stdout of test 'outer_join_using_diff_types_using.Bug-3536` in directory 'sql/test/BugTracker-2014` itself: + + +# 11:45:36 > +# 11:45:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31021" "--set" "mapi_usock=/var/tmp/mtest-13021/.s.monetdb.31021" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014" "--set" "mal_listing=0" +# 11:45:36 > + +# MonetDB 5 server v11.17.22 +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2014', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 7.334 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://localhost.nes.nl:31021/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-13021/.s.monetdb.31021 +# MonetDB/GIS module loaded +# MonetDB/JAQL module loaded +# MonetDB/SQL module loaded + +Ready. + +# 11:45:36 > +# 11:45:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-13021" "--port=31021" +# 11:45:36 > + +#create table test_a (a integer); +#create table test_b (a smallint); +#select * from test_a join test_b using (a); +% sys.L1 # table_name +% a # name +% int # type +% 1 # length +#select * from test_a left outer join test_b using (a); +% .L1 # table_name +% a # name +% int # type +% 1 # length +#drop table test_a; +#drop table test_b; + +# 11:45:36 > +# 11:45:36 > "Done." +# 11:45:36 > + _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list