Changeset: 92f0efcae4d5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=92f0efcae4d5
Added Files:
sql/test/BugTracker-2012/Tests/round-type-inference.Bug-2987.sql
sql/test/BugTracker-2012/Tests/round-type-inference.Bug-2987.stable.err
sql/test/BugTracker-2012/Tests/round-type-inference.Bug-2987.stable.out
Modified Files:
sql/common/sql_types.c
sql/server/rel_select.c
sql/test/BugTracker-2012/Tests/All
Branch: Apr2012
Log Message:
fixed bug in type inference with round (and a like) functions
diffs (142 lines):
diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -702,6 +702,28 @@ sql_bind_member(sql_allocator *sa, sql_s
}
}
}
+ if (tp->type->eclass == EC_NUM) {
+ /* add second round but now look for Decimals only */
+ for (n = funcs->h; n; n = n->next) {
+ sql_func *f = n->data;
+
+ if (!f->res.type)
+ continue;
+ if (strcmp(f->base.name, sqlfname) == 0 &&
list_length(f->ops) == nrargs) {
+ if (((sql_arg *)
f->ops->h->data)->type.type->eclass == EC_DEC &&
+ ((sql_arg *)
f->ops->h->data)->type.type->localtype == tp->type->localtype) {
+
+ unsigned int scale = 0, digits;
+ sql_subfunc *fres = SA_ZNEW(sa,
sql_subfunc);
+
+ fres->func = f;
+ digits = f->res.digits;
+ sql_init_subtype(&fres->res,
f->res.type, digits, scale);
+ return fres;
+ }
+ }
+ }
+ }
return NULL;
}
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
@@ -1947,8 +1947,7 @@ static sql_exp *
exp_sum_scales(mvc *sql, sql_subfunc *f, sql_exp *l, sql_exp *r)
{
if (strcmp(f->func->imp, "*") == 0 &&
- f->func->res.type->scale == SCALE_FIX)
- {
+ f->func->res.type->scale == SCALE_FIX) {
sql_subtype t;
sql_subtype *lt = exp_subtype(l);
sql_subtype *rt = exp_subtype(r);
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
@@ -32,3 +32,4 @@ table_functions_fail_after_restart-0.Bug
table_functions_fail_after_restart-1.Bug-3063
user_defined_decimal_function.Bug-2992
non_keyword_no.Bug-3079
+round-type-inference.Bug-2987
diff --git a/sql/test/BugTracker-2012/Tests/round-type-inference.Bug-2987.sql
b/sql/test/BugTracker-2012/Tests/round-type-inference.Bug-2987.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/round-type-inference.Bug-2987.sql
@@ -0,0 +1,1 @@
+select round(750,1);
diff --git
a/sql/test/BugTracker-2012/Tests/round-type-inference.Bug-2987.stable.err
b/sql/test/BugTracker-2012/Tests/round-type-inference.Bug-2987.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/round-type-inference.Bug-2987.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'round-type-inference.Bug-2987` in directory
'test/BugTracker-2012` itself:
+
+
+# 13:46:34 >
+# 13:46:34 > "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=39315" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 13:46:34 >
+
+# 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 = 39315
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2012
+# cmdline opt mal_listing = 0
+
+# 13:46:34 >
+# 13:46:34 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=39315"
+# 13:46:34 >
+
+
+# 13:46:35 >
+# 13:46:35 > "Done."
+# 13:46:35 >
+
diff --git
a/sql/test/BugTracker-2012/Tests/round-type-inference.Bug-2987.stable.out
b/sql/test/BugTracker-2012/Tests/round-type-inference.Bug-2987.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/round-type-inference.Bug-2987.stable.out
@@ -0,0 +1,36 @@
+stdout of test 'round-type-inference.Bug-2987` in directory
'test/BugTracker-2012` itself:
+
+
+# 13:46:34 >
+# 13:46:34 > "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=39315" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 13:46:34 >
+
+# MonetDB 5 server v11.9.2
+# 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.778 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:39315/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 13:46:34 >
+# 13:46:34 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=39315"
+# 13:46:34 >
+
+#select round(750,1);
+% . # table_name
+% round_single_value # name
+% decimal # type
+% 5 # length
+[ 750 ]
+
+# 13:46:35 >
+# 13:46:35 > "Done."
+# 13:46:35 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
