Changeset: c74846d6a2e8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c74846d6a2e8
Added Files:
sql/test/bugs/Tests/polymorphism.sql
sql/test/bugs/Tests/polymorphism.stable.err
sql/test/bugs/Tests/polymorphism.stable.out
Modified Files:
sql/common/sql_types.c
sql/test/bugs/Tests/All
Branch: Feb2013
Log Message:
add fixes for bug with polymorphism (reported some time back by holger)
diffs (196 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
@@ -691,6 +691,8 @@ sql_bind_member(sql_allocator *sa, sql_s
if (tp && f->fix_scale == INOUT)
digits = tp->digits;
sql_init_subtype(&fres->res, f->res.type,
digits, scale);
+ if (f->res.comp_type)
+ fres->res.comp_type = f->res.comp_type;
return fres;
}
}
@@ -712,6 +714,37 @@ sql_bind_member(sql_allocator *sa, sql_s
fres->func = f;
digits = f->res.digits;
sql_init_subtype(&fres->res,
f->res.type, digits, scale);
+ if (f->res.comp_type)
+ fres->res.comp_type =
f->res.comp_type;
+ return fres;
+ }
+ }
+ }
+ }
+ if (s) {
+ node *n;
+
+ if (s->funcs.set) for (n=s->funcs.set->h; n; n = n->next) {
+ sql_func *f = n->data;
+
+ if (!f->res.type)
+ continue;
+ if (strcmp(f->base.name, sqlfname) == 0) {
+ if (list_length(f->ops) == nrargs &&
is_subtype(tp, &((sql_arg *) f->ops->h->data)->type)) {
+
+ unsigned int scale = 0, digits;
+ sql_subfunc *fres = SA_ZNEW(sa,
sql_subfunc);
+
+ fres->func = f;
+ /* same scale as the input */
+ if (tp && tp->scale > scale)
+ scale = tp->scale;
+ digits = f->res.digits;
+ if (tp && f->fix_scale == INOUT)
+ digits = tp->digits;
+ sql_init_subtype(&fres->res,
f->res.type, digits, scale);
+ if (f->res.comp_type)
+ fres->res.comp_type =
f->res.comp_type;
return fres;
}
}
diff --git a/sql/test/bugs/Tests/All b/sql/test/bugs/Tests/All
--- a/sql/test/bugs/Tests/All
+++ b/sql/test/bugs/Tests/All
@@ -102,3 +102,4 @@ in_or_bug
create_insert_select_aggr-bug-00001
procedure_resolution_bug
correlated_update_bug
+polymorphism
diff --git a/sql/test/bugs/Tests/polymorphism.sql
b/sql/test/bugs/Tests/polymorphism.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/bugs/Tests/polymorphism.sql
@@ -0,0 +1,29 @@
+start transaction;
+
+create function bwdecompose(col decimal(7,2), bits integer)
+ returns varchar(4096)
+begin
+ return 1 || cast ( col as varchar(20));
+end;
+
+create function bwdecompose(col date, bits integer)
+returns varchar(4096)
+begin
+ return 2 || cast ( col as varchar(20));
+end;
+
+create function bwdecompose(col integer, bits integer)
+returns varchar(4096)
+begin
+ return 3 || cast ( col as varchar(20));
+end;
+
+create table bwd (
+ l_int integer,
+ l_dat date,
+ l_dec decimal(7,2)
+);
+
+select bwdecompose(l_int,24), bwdecompose(l_dat,24), bwdecompose(l_dec,24)
from bwd;
+
+rollback;
diff --git a/sql/test/bugs/Tests/polymorphism.stable.err
b/sql/test/bugs/Tests/polymorphism.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/bugs/Tests/polymorphism.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'polymorphism` in directory 'sql/test/bugs` itself:
+
+
+# 19:03:19 >
+# 19:03:19 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33115" "--set"
"mapi_usock=/var/tmp/mtest-18423/.s.monetdb.33115" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_bugs"
"--set" "mal_listing=0"
+# 19:03:19 >
+
+# 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 = 33115
+# cmdline opt mapi_usock = /var/tmp/mtest-18423/.s.monetdb.33115
+# 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_bugs
+# cmdline opt mal_listing = 0
+
+# 19:03:19 >
+# 19:03:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-18423" "--port=33115"
+# 19:03:19 >
+
+
+# 19:03:19 >
+# 19:03:19 > "Done."
+# 19:03:19 >
+
diff --git a/sql/test/bugs/Tests/polymorphism.stable.out
b/sql/test/bugs/Tests/polymorphism.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/bugs/Tests/polymorphism.stable.out
@@ -0,0 +1,59 @@
+stdout of test 'polymorphism` in directory 'sql/test/bugs` itself:
+
+
+# 19:03:19 >
+# 19:03:19 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33115" "--set"
"mapi_usock=/var/tmp/mtest-18423/.s.monetdb.33115" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_bugs"
"--set" "mal_listing=0"
+# 19:03:19 >
+
+# MonetDB 5 server v11.15.4
+# This is an unreleased version
+# Serving database 'mTests_sql_test_bugs', 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-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:33115/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-18423/.s.monetdb.33115
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 19:03:19 >
+# 19:03:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-18423" "--port=33115"
+# 19:03:19 >
+
+#start transaction;
+#create function bwdecompose(col decimal(7,2), bits integer)
+# returns varchar(4096)
+#begin
+# return 1 || cast ( col as varchar(20));
+#end;
+#create function bwdecompose(col date, bits integer)
+#returns varchar(4096)
+#begin
+# return 2 || cast ( col as varchar(20));
+#end;
+#create function bwdecompose(col integer, bits integer)
+#returns varchar(4096)
+#begin
+# return 3 || cast ( col as varchar(20));
+#end;
+#create table bwd (
+# l_int integer,
+# l_dat date,
+# l_dec decimal(7,2)
+#);
+#select bwdecompose(l_int,24), bwdecompose(l_dat,24), bwdecompose(l_dec,24)
from bwd;
+% sys., sys., sys. # table_name
+% bwdecompose_l_int, bwdecompose_l_dat, bwdecompose_l_dec # name
+% varchar, varchar, varchar # type
+% 0, 0, 0 # length
+#rollback;
+
+# 19:03:19 >
+# 19:03:19 > "Done."
+# 19:03:19 >
+
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
