Changeset: 87af5a5903a8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=87af5a5903a8
Added Files:
sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.sql
sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.stable.err
sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.stable.out
Modified Files:
sql/backends/monet5/sql.c
sql/server/rel_select.c
sql/server/rel_semantic.c
sql/server/rel_semantic.h
sql/test/BugTracker-2015/Tests/All
Branch: default
Log Message:
fixed bug in handling view's and schema's (fixed bug 3708)
diffs (261 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -415,7 +415,7 @@ create_table_or_view(mvc *sql, char *sna
sql->sa = sa_create();
buf = sa_alloc(sql->sa, strlen(c->def) + 8);
snprintf(buf, BUFSIZ, "select %s;", c->def);
- r = rel_parse(sql, buf, m_deps);
+ r = rel_parse(sql, s, buf, m_deps);
if (!r || !is_project(r->op) || !r->exps ||
list_length(r->exps) != 1 || rel_check_type(sql, &c->type, r->exps->h->data,
type_equal) == NULL)
throw(SQL, "sql.catalog", "%s", sql->errstr);
rel_destroy(r);
@@ -450,7 +450,7 @@ create_table_or_view(mvc *sql, char *sna
sql_rel *r = NULL;
sql->sa = sa_create();
- r = rel_parse(sql, nt->query, m_deps);
+ r = rel_parse(sql, s, nt->query, m_deps);
if (r)
r = rel_optimizer(sql, r);
if (r) {
@@ -848,7 +848,7 @@ create_func(mvc *sql, char *sname, sql_f
sql->sa = sa_create();
buf = sa_strdup(sql->sa, nf->query);
- r = rel_parse(sql, buf, m_deps);
+ r = rel_parse(sql, s, buf, m_deps);
if (r)
r = rel_optimizer(sql, r);
if (r) {
@@ -978,7 +978,7 @@ create_trigger(mvc *sql, char *sname, ch
sql->sa = sa_create();
buf = sa_strdup(sql->sa, query);
- r = rel_parse(sql, buf, m_deps);
+ r = rel_parse(sql, s, buf, m_deps);
if (r)
r = rel_optimizer(sql, r);
/* TODO use relational part to find dependencies */
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
@@ -1812,7 +1812,7 @@ table_ref(mvc *sql, sql_rel *rel, symbol
if (sql->emode == m_deps)
rel = rel_basetable(sql, t, tname);
else
- rel = rel_parse(sql, t->query, m_instantiate);
+ rel = rel_parse(sql, t->s, t->query,
m_instantiate);
if (!rel)
return rel;
diff --git a/sql/server/rel_semantic.c b/sql/server/rel_semantic.c
--- a/sql/server/rel_semantic.c
+++ b/sql/server/rel_semantic.c
@@ -83,18 +83,21 @@ compare2range( int l, int r )
sql_rel *
-rel_parse(mvc *m, char *query, char emode)
+rel_parse(mvc *m, sql_schema *s, char *query, char emode)
{
mvc o = *m;
sql_rel *rel;
buffer *b;
char *n;
int len = _strlen(query);
+ sql_schema *c = cur_schema(m);
m->qc = NULL;
m->caching = 0;
m->emode = emode;
+ if (s)
+ m->session->schema = s;
b = (buffer*)GDKmalloc(sizeof(buffer));
n = GDKmalloc(len + 1 + 1);
@@ -139,6 +142,7 @@ rel_parse(mvc *m, char *query, char emod
*m = o;
m->label = label;
}
+ m->session->schema = c;
return rel;
}
diff --git a/sql/server/rel_semantic.h b/sql/server/rel_semantic.h
--- a/sql/server/rel_semantic.h
+++ b/sql/server/rel_semantic.h
@@ -16,7 +16,7 @@
#include <stdarg.h>
extern sql_rel *rel_semantic(mvc *sql, symbol *sym);
-extern sql_rel *rel_parse(mvc *m, char *query, char emode);
+extern sql_rel *rel_parse(mvc *m, sql_schema *s, char *query, char emode);
extern comp_type swap_compare( comp_type t );
extern comp_type range2lcompare( int r );
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
@@ -30,3 +30,5 @@ convert-to-bit.Bug-3719
union_project.Bug-3723
leftjoin.Bug-3720
adddrop_unknown_table.Bug-3718
+schema_view.Bug-3708
+
diff --git a/sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.sql
b/sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.sql
@@ -0,0 +1,26 @@
+create schema s1;
+create schema s2;
+set schema s1;
+create table s3 (x int);
+create view s4 as select * from s3;
+select * from s1.s4;
+set schema s2;
+select * from s1.s4;
+
+set schema sys;
+drop schema s1;
+drop schema s2;
+
+create schema s1;
+create schema s2;
+create table s1.s3 (x int);
+create table s2.s3 (x int);
+set schema s1;
+create view s4 as select * from s3;
+plan select * from s1.s4;
+set schema s2;
+plan select * from s1.s4;
+
+set schema sys;
+drop schema s1;
+drop schema s2;
diff --git a/sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.stable.err
b/sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'schema_view.Bug-3708` in directory 'sql/test/BugTracker-2015`
itself:
+
+
+# 20:32:53 >
+# 20:32:53 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35225" "--set"
"mapi_usock=/var/tmp/mtest-26961/.s.monetdb.35225" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 20:32:53 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/monetdb/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 = 35225
+# cmdline opt mapi_usock = /var/tmp/mtest-26961/.s.monetdb.35225
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/monetdb/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
+
+# 20:32:53 >
+# 20:32:53 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26961" "--port=35225"
+# 20:32:53 >
+
+
+# 20:32:54 >
+# 20:32:54 > "Done."
+# 20:32:54 >
+
diff --git a/sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.stable.out
b/sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.stable.out
@@ -0,0 +1,77 @@
+stdout of test 'schema_view.Bug-3708` in directory 'sql/test/BugTracker-2015`
itself:
+
+
+# 20:32:53 >
+# 20:32:53 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35225" "--set"
"mapi_usock=/var/tmp/mtest-26961/.s.monetdb.35225" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 20:32:53 >
+
+# MonetDB 5 server v11.20.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 7.333 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://localhost.nes.nl:35225/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-26961/.s.monetdb.35225
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 20:32:53 >
+# 20:32:53 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26961" "--port=35225"
+# 20:32:53 >
+
+#create schema s1;
+#create schema s2;
+#set schema s1;
+#create table s3 (x int);
+#create view s4 as select * from s3;
+#select * from s1.s4;
+% s1.s4 # table_name
+% x # name
+% int # type
+% 1 # length
+#set schema s2;
+#select * from s1.s4;
+% s1.s4 # table_name
+% x # name
+% int # type
+% 1 # length
+#set schema sys;
+#drop schema s1;
+#drop schema s2;
+#create schema s1;
+#create schema s2;
+#create table s1.s3 (x int);
+#create table s2.s3 (x int);
+#set schema s1;
+#create view s4 as select * from s3;
+#plan select * from s1.s4;
+% .plan # table_name
+% rel # name
+% clob # type
+% 30 # length
+project (
+| table(s1.s3) [ s3.x ] COUNT
+) [ s3.x as s4.x ]
+#set schema s2;
+#plan select * from s1.s4;
+% .plan # table_name
+% rel # name
+% clob # type
+% 30 # length
+project (
+| table(s1.s3) [ s3.x ] COUNT
+) [ s3.x as s4.x ]
+#set schema sys;
+#drop schema s1;
+#drop schema s2;
+
+# 20:32:54 >
+# 20:32:54 > "Done."
+# 20:32:54 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
