Changeset: d6365fe49c70 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d6365fe49c70
Added Files:
sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.sql
sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.stable.err
sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.stable.out
Modified Files:
sql/server/rel_psm.c
sql/test/BugTracker-2012/Tests/All
Branch: Apr2012
Log Message:
fixed bug 3074, ie switch to the schema of the to be created function.
diffs (142 lines):
diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c
--- a/sql/server/rel_psm.c
+++ b/sql/server/rel_psm.c
@@ -746,8 +746,12 @@ rel_create_func(mvc *sql, dlist *qname,
if (body) { /* sql func */
list *b = NULL;
+ sql_schema *old_schema = cur_schema(sql);
+ if (s)
+ sql->session->schema = s;
b = sequential_block(sql, restype, body, NULL,
is_func);
+ sql->session->schema = old_schema;
sql->params = NULL;
if (!b)
return NULL;
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
@@ -25,3 +25,4 @@ multiple-arithmetic-operations.Bug-3048
bart-crash.Bug-3057
set_operation.Bug-3059
delete-with-constant-where.Bug-3065
+name_resolution_in_proc.Bug-3074
diff --git
a/sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.sql
b/sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.sql
@@ -0,0 +1,18 @@
+start transaction;
+
+create schema datacell;
+create table runningcatalog(
+ tag timestamp
+);
+
+create table datacell.lta(
+ tag timestamp
+);
+
+create procedure datacell.archive()
+begin
+ insert into runningcatalog select * from datacell.lta;
+end;
+call datacell.archive();
+
+rollback;
diff --git
a/sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.stable.err
b/sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.stable.err
@@ -0,0 +1,46 @@
+stderr of test 'name_resolution_in_proc.Bug-3074` in directory
'test/BugTracker-2012` itself:
+
+
+# 16:33:04 >
+# 16:33:04 > "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=35071" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 16:33:04 >
+
+# 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 = 35071
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2012
+# cmdline opt mal_listing = 0
+
+# 16:33:04 >
+# 16:33:04 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=35071"
+# 16:33:04 >
+
+MAPI = monetdb@niels:35071
+QUERY = create procedure datacell.archive()
+ begin
+ insert into runningcatalog select * from datacell.lta;
+ end;
+ERROR = !INSERT INTO: no such table 'runningcatalog'
+MAPI = monetdb@niels:35071
+QUERY = call datacell.archive();
+ERROR = !current transaction is aborted (please ROLLBACK)
+
+# 16:33:04 >
+# 16:33:04 > "Done."
+# 16:33:04 >
+
diff --git
a/sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.stable.out
b/sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.stable.out
@@ -0,0 +1,39 @@
+stdout of test 'name_resolution_in_proc.Bug-3074` in directory
'test/BugTracker-2012` itself:
+
+
+# 16:33:04 >
+# 16:33:04 > "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=35071" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 16:33:04 >
+
+# 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:35071/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 16:33:04 >
+# 16:33:04 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=35071"
+# 16:33:04 >
+
+#start transaction;
+#create schema datacell;
+#create table runningcatalog(
+# tag timestamp
+#);
+#create table datacell.lta(
+# tag timestamp
+#);
+#rollback;
+
+# 16:33:04 >
+# 16:33:04 > "Done."
+# 16:33:04 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
