Changeset: af3ddc46d55e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af3ddc46d55e
Added Files:
sql/test/BugTracker-2013/Tests/add_boolean.Bug-3289.sql
sql/test/BugTracker-2013/Tests/add_boolean.Bug-3289.stable.err
sql/test/BugTracker-2013/Tests/add_boolean.Bug-3289.stable.out
Modified Files:
sql/backends/monet5/rel_bin.c
sql/server/rel_select.c
sql/test/BugTracker-2013/Tests/All
Branch: default
Log Message:
Merged with Feb2013 branch;
omitting changeset 47733:708e850ffb9c as requested by Lefteris.
diffs (128 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
@@ -3395,7 +3395,9 @@ rel_binop_(mvc *sql, sql_exp *l, sql_exp
if (!t1 || !t2)
return sql_error(sql, 01, "Cannot have a parameter (?) on both
sides of an expression");
- if ((is_addition(fname) || is_subtraction(fname)) && t1->type->eclass
== EC_NUM && t2->type->eclass == EC_NUM) {
+ if ((is_addition(fname) || is_subtraction(fname)) &&
+ ((t1->type->eclass == EC_NUM && t2->type->eclass == EC_NUM) ||
+ (t1->type->eclass == EC_BIT && t2->type->eclass == EC_BIT))) {
sql_subtype ntp;
sql_find_numeric(&ntp, t1->type->localtype, t1->digits+1);
diff --git a/sql/test/BugTracker-2013/Tests/All
b/sql/test/BugTracker-2013/Tests/All
--- a/sql/test/BugTracker-2013/Tests/All
+++ b/sql/test/BugTracker-2013/Tests/All
@@ -19,3 +19,4 @@ median-null.Bug-3280
corrupt-after-restart.Bug-3282
db_users.Bug-3287
create_table_with_func.Bug-3286
+add_boolean.Bug-3289
diff --git a/sql/test/BugTracker-2013/Tests/add_boolean.Bug-3289.sql
b/sql/test/BugTracker-2013/Tests/add_boolean.Bug-3289.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/add_boolean.Bug-3289.sql
@@ -0,0 +1,7 @@
+create table t_add_bool ("v1" int,"v2" int, "v3" int);
+insert into t_add_bool ("v1","v2","v3") values (1,1,1);
+insert into t_add_bool ("v1","v2","v3") values (1,2,1);
+insert into t_add_bool("v1","v2","v3") values (1,2,3);
+insert into t_add_bool ("v1","v2","v3") values (4,4,4);
+select * from t_add_bool where (("v1" > 1)+("v2" > 1)+("v3" > 1)) > 1;
+drop table t_add_bool;
diff --git a/sql/test/BugTracker-2013/Tests/add_boolean.Bug-3289.stable.err
b/sql/test/BugTracker-2013/Tests/add_boolean.Bug-3289.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/add_boolean.Bug-3289.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'add_boolean.Bug-3289` in directory 'sql/test/BugTracker-2013`
itself:
+
+
+# 19:26:54 >
+# 19:26:54 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36389" "--set"
"mapi_usock=/var/tmp/mtest-17257/.s.monetdb.36389" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 19:26:54 >
+
+# 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 = 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 mapi_open = true
+# cmdline opt mapi_port = 36389
+# cmdline opt mapi_usock = /var/tmp/mtest-17257/.s.monetdb.36389
+# 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-2013
+# cmdline opt mal_listing = 0
+
+# 19:26:54 >
+# 19:26:54 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17257" "--port=36389"
+# 19:26:54 >
+
+
+# 19:26:54 >
+# 19:26:54 > "Done."
+# 19:26:54 >
+
diff --git a/sql/test/BugTracker-2013/Tests/add_boolean.Bug-3289.stable.out
b/sql/test/BugTracker-2013/Tests/add_boolean.Bug-3289.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/add_boolean.Bug-3289.stable.out
@@ -0,0 +1,49 @@
+stdout of test 'add_boolean.Bug-3289` in directory 'sql/test/BugTracker-2013`
itself:
+
+
+# 19:26:54 >
+# 19:26:54 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36389" "--set"
"mapi_usock=/var/tmp/mtest-17257/.s.monetdb.36389" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 19:26:54 >
+
+# MonetDB 5 server v11.15.4
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2013', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 3.777 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2013 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:36389/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-17257/.s.monetdb.36389
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 19:26:54 >
+# 19:26:54 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17257" "--port=36389"
+# 19:26:54 >
+
+#create table t_add_bool ("v1" int,"v2" int, "v3" int);
+#insert into t_add_bool ("v1","v2","v3") values (1,1,1);
+[ 1 ]
+#insert into t_add_bool ("v1","v2","v3") values (1,2,1);
+[ 1 ]
+#insert into t_add_bool("v1","v2","v3") values (1,2,3);
+[ 1 ]
+#insert into t_add_bool ("v1","v2","v3") values (4,4,4);
+[ 1 ]
+#select * from t_add_bool where (("v1" > 1)+("v2" > 1)+("v3" > 1)) > 1;
+% sys.t_add_bool, sys.t_add_bool, sys.t_add_bool # table_name
+% v1, v2, v3 # name
+% int, int, int # type
+% 1, 1, 1 # length
+[ 1, 2, 3 ]
+[ 4, 4, 4 ]
+#drop table t_add_bool;
+
+# 19:26:54 >
+# 19:26:54 > "Done."
+# 19:26:54 >
+
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
