Changeset: aa359ac1eb36 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aa359ac1eb36
Modified Files:
sql/server/rel_select.c
sql/test/BugTracker-2012/Tests/All
sql/test/BugTracker-2012/Tests/boolean_coersion.Bug-3012.sql
sql/test/BugTracker-2012/Tests/boolean_coersion.Bug-3012.stable.err
sql/test/BugTracker-2012/Tests/boolean_coersion.Bug-3012.stable.out
Branch: Dec2011
Log Message:
fixed boolean coerson problem See bug 3012
diffs (150 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
@@ -2770,11 +2770,13 @@ rel_logical_value_exp(mvc *sql, sql_rel
}
default: {
sql_exp *re, *le = rel_value_exp(sql, rel, sc, f, ek);
+ sql_subtype bt;
if (!le)
return NULL;
re = exp_atom_bool(sql->sa, 1);
- if (rel_convert_types(sql, &le, &re, 1, type_equal) < 0)
+ sql_find_subtype(&bt, "boolean", 0, 0);
+ if ((le = rel_check_type(sql, &bt, le, type_equal)) == NULL)
return NULL;
return rel_binop_(sql, le, re, NULL, "=", 0);
}
diff --git a/sql/test/BugTracker-2012/Tests/All
b/sql/test/BugTracker-2012/Tests/All
--- a/sql/test/BugTracker-2012/Tests/All
+++ b/sql/test/BugTracker-2012/Tests/All
@@ -13,3 +13,4 @@ rangejoin.Bug-3017
outerjoin_select.Bug-2946
leftjoin-Bug.3041
with_in_derived_table.Bug-3043
+boolean_coersion.Bug-3012
diff --git a/sql/test/BugTracker-2012/Tests/boolean_coersion.Bug-3012.sql
b/sql/test/BugTracker-2012/Tests/boolean_coersion.Bug-3012.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/boolean_coersion.Bug-3012.sql
@@ -0,0 +1,6 @@
+select 16 and 16;
+select cast(16 as smallint) and cast(16 as smallint);
+select bit_and(cast(16 as smallint), cast(16 as smallint)) = cast(16 as
smallint);
+select bit_and(16,16) ;
+select 16 and cast(16 as int);
+select bit_and(16,cast(16 as int)) ;
diff --git
a/sql/test/BugTracker-2012/Tests/boolean_coersion.Bug-3012.stable.err
b/sql/test/BugTracker-2012/Tests/boolean_coersion.Bug-3012.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/boolean_coersion.Bug-3012.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'boolean_coersion.Bug-3012` in directory 'test/BugTracker-2012`
itself:
+
+
+# 14:35:37 >
+# 14:35:37 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=32436" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 14:35:37 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/home/niels/scratch/rc-clean/Linux-x86_64/var/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# 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 gdk_dbfarm =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 32436
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2012
+# cmdline opt mal_listing = 0
+
+# 14:35:38 >
+# 14:35:38 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=32436"
+# 14:35:38 >
+
+
+# 14:35:38 >
+# 14:35:38 > "Done."
+# 14:35:38 >
+
diff --git
a/sql/test/BugTracker-2012/Tests/boolean_coersion.Bug-3012.stable.out
b/sql/test/BugTracker-2012/Tests/boolean_coersion.Bug-3012.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/boolean_coersion.Bug-3012.stable.out
@@ -0,0 +1,66 @@
+stdout of test 'boolean_coersion.Bug-3012` in directory 'test/BugTracker-2012`
itself:
+
+
+# 14:35:37 >
+# 14:35:37 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=32436" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 14:35:37 >
+
+# MonetDB 5 server v11.7.8
+# This is an unreleased version
+# Serving database 'mTests_test_BugTracker-2012', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 3.779 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://niels.nesco.mine.nu:32436/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 14:35:38 >
+# 14:35:38 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=32436"
+# 14:35:38 >
+
+#select 16 and 16;
+% . # table_name
+% and_single_value # name
+% boolean # type
+% 5 # length
+[ true ]
+#select cast(16 as smallint) and cast(16 as smallint);
+% . # table_name
+% and_=_single_value # name
+% boolean # type
+% 5 # length
+[ true ]
+#select bit_and(cast(16 as smallint), cast(16 as smallint)) = cast(16 as
smallint);
+% . # table_name
+% bit_and_single_value # name
+% boolean # type
+% 5 # length
+[ true ]
+#select bit_and(16,16) ;
+% . # table_name
+% bit_and_single_value # name
+% tinyint # type
+% 2 # length
+[ 16 ]
+#select 16 and cast(16 as int);
+% . # table_name
+% and_single_value # name
+% boolean # type
+% 5 # length
+[ true ]
+#select bit_and(16,cast(16 as int)) ;
+% . # table_name
+% bit_and_single_value # name
+% int # type
+% 2 # length
+[ 16 ]
+
+# 14:35:38 >
+# 14:35:38 > "Done."
+# 14:35:38 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
