Changeset: 4a112fdbb971 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a112fdbb971
Added Files:
sql/test/BugTracker-2015/Tests/case_type.Bug-3821.sql
sql/test/BugTracker-2015/Tests/case_type.Bug-3821.stable.err
sql/test/BugTracker-2015/Tests/case_type.Bug-3821.stable.out
Modified Files:
sql/server/rel_select.c
sql/test/BugTracker-2015/Tests/All
Branch: Jul2015
Log Message:
fixed bug 3821, ie check type of condition properly
diffs (130 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
@@ -4271,11 +4271,12 @@ rel_case(mvc *sql, sql_rel **rel, int to
list *conds = new_exp_list(sql->sa);
list *results = new_exp_list(sql->sa);
dnode *dn = when_search_list->h;
- sql_subtype *restype = NULL, rtype;
+ sql_subtype *restype = NULL, rtype, bt;
sql_exp *res = NULL, *else_exp = NULL;
node *n, *m;
exp_kind ek = {type_value, card_column, FALSE};
+ sql_find_subtype(&bt, "boolean", 0, 0);
if (dn) {
sql_exp *cond = NULL, *result = NULL;
@@ -4397,6 +4398,9 @@ rel_case(mvc *sql, sql_rel **rel, int to
if (!(result = rel_check_type(sql, restype, result,
type_equal)))
return NULL;
+ if (!(cond = rel_check_type(sql, &bt, cond, type_equal)))
+ return NULL;
+
/* remove any null's in the condition */
if (has_nil(cond)) {
sql_exp *condnil = rel_unop_(sql, cond, NULL, "isnull",
card_value);
diff --git a/sql/test/BugTracker-2015/Tests/All
b/sql/test/BugTracker-2015/Tests/All
--- a/sql/test/BugTracker-2015/Tests/All
+++ b/sql/test/BugTracker-2015/Tests/All
@@ -65,3 +65,4 @@ string_split.Bug-3564
not-like-without-wildcard.Bug-3811
copy_into.Bug-3813
select-tilde-arg.Bug-3814
+case_type.Bug-3821
diff --git a/sql/test/BugTracker-2015/Tests/case_type.Bug-3821.sql
b/sql/test/BugTracker-2015/Tests/case_type.Bug-3821.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/case_type.Bug-3821.sql
@@ -0,0 +1,1 @@
+ select case when 1 then 2 else 3 end;
diff --git a/sql/test/BugTracker-2015/Tests/case_type.Bug-3821.stable.err
b/sql/test/BugTracker-2015/Tests/case_type.Bug-3821.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/case_type.Bug-3821.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'case_type.Bug-3821` in directory 'sql/test/BugTracker-2015`
itself:
+
+
+# 10:18:34 >
+# 10:18:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33329" "--set"
"mapi_usock=/var/tmp/mtest-6004/.s.monetdb.33329" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/scratch/niels/build/rc/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 10:18:34 >
+
+# builtin opt gdk_dbpath =
/scratch/niels/build/rc/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 = 33329
+# cmdline opt mapi_usock = /var/tmp/mtest-6004/.s.monetdb.33329
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/scratch/niels/build/rc/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 10:18:34 >
+# 10:18:34 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-6004" "--port=33329"
+# 10:18:34 >
+
+
+# 10:18:34 >
+# 10:18:34 > "Done."
+# 10:18:34 >
+
diff --git a/sql/test/BugTracker-2015/Tests/case_type.Bug-3821.stable.out
b/sql/test/BugTracker-2015/Tests/case_type.Bug-3821.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/case_type.Bug-3821.stable.out
@@ -0,0 +1,42 @@
+stdout of test 'case_type.Bug-3821` in directory 'sql/test/BugTracker-2015`
itself:
+
+
+# 10:18:34 >
+# 10:18:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33329" "--set"
"mapi_usock=/var/tmp/mtest-6004/.s.monetdb.33329" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/scratch/niels/build/rc/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 10:18:34 >
+
+# MonetDB 5 server v11.21.6
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.586 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://rocks101.scilens.private:33329/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-6004/.s.monetdb.33329
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.45'
+# Finished reading the write-ahead log 'sql_logs/sql/log.45'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 10:18:34 >
+# 10:18:34 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-6004" "--port=33329"
+# 10:18:34 >
+
+#select case when 1 then 2 else 3 end;
+% .L # table_name
+% isnull_single_value # name
+% tinyint # type
+% 1 # length
+[ 2 ]
+
+# 10:18:34 >
+# 10:18:34 > "Done."
+# 10:18:34 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
