Changeset: 2810a6a4ef0e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2810a6a4ef0e
Added Files:
sql/test/BugTracker-2013/Tests/duplicate_column_name.Bug-3349.sql
sql/test/BugTracker-2013/Tests/duplicate_column_name.Bug-3349.stable.err
sql/test/BugTracker-2013/Tests/duplicate_column_name.Bug-3349.stable.out
Modified Files:
sql/server/rel_select.c
sql/test/BugTracker-2013/Tests/All
Branch: Feb2013
Log Message:
fixed bug 3349, ie check for duplicate column names after table level rename.
diffs (187 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
@@ -1180,24 +1180,36 @@ rel_add_intern(mvc *sql, sql_rel *rel)
static sql_rel *
rel_table_optname(mvc *sql, sql_rel *sq, symbol *optname)
{
- (void)sql;
if (optname && optname->token == SQL_NAME) {
dlist *columnrefs = NULL;
char *tname = optname->data.lval->h->data.sval;
+ list *l = sa_list(sql->sa);
columnrefs = optname->data.lval->h->next->data.lval;
if (columnrefs && sq->exps) {
dnode *d = columnrefs->h;
node *ne = sq->exps->h;
- for (; d && ne; d = d->next, ne = ne->next)
- exp_setname(sql->sa, ne->data, tname,
d->data.sval );
+ for (; d && ne; d = d->next, ne = ne->next) {
+ sql_exp *e = ne->data;
+
+ if (exps_bind_column2(l, tname, d->data.sval))
+ return sql_error(sql, ERR_AMBIGUOUS,
"SELECT: Duplicate column name '%s.%s'", tname, d->data.sval);
+ exp_setname(sql->sa, e, tname, d->data.sval );
+ append(l, e);
+ }
}
if (!columnrefs && sq->exps) {
node *ne = sq->exps->h;
- for (; ne; ne = ne->next)
- noninternexp_setname(sql->sa, ne->data, tname,
NULL );
+ for (; ne; ne = ne->next) {
+ sql_exp *e = ne->data;
+
+ if (exp_name(e) && exps_bind_column2(l, tname,
exp_name(e)))
+ return sql_error(sql, ERR_AMBIGUOUS,
"SELECT: Duplicate column name '%s.%s'", tname, exp_name(e));
+ noninternexp_setname(sql->sa, e, tname, NULL );
+ append(l, e);
+ }
}
}
rel_add_intern(sql, sq);
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
@@ -38,3 +38,4 @@ sort_void_crash.Bug-3341
bogus_aggregation_casts.Bug-3342
nestedcalls
like_pcre_or.Bug-3348
+duplicate_column_name.Bug-3349
diff --git a/sql/test/BugTracker-2013/Tests/duplicate_column_name.Bug-3349.sql
b/sql/test/BugTracker-2013/Tests/duplicate_column_name.Bug-3349.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/duplicate_column_name.Bug-3349.sql
@@ -0,0 +1,22 @@
+
+CREATE TABLE test (x int, y int);
+insert into test (x, y) VALUES (1, 1);
+insert into test (x, y) VALUES (1, 2);
+
+SELECT *
+FROM (
+ SELECT a1.x, a1.y, a2.x, a2.y
+ FROM ( SELECT * FROM test) AS a1 JOIN
+ ( SELECT * FROM test) AS a2
+ ON a1.x = a2.x
+ ) AS t;
+
+SELECT *
+FROM (
+ SELECT a1.x AS x1, a1.y AS y1, a2.x AS x2, a2.y AS y2
+ FROM ( SELECT * FROM test) AS a1 JOIN
+ ( SELECT * FROM test) AS a2
+ ON a1.x = a2.x
+ ) AS t;
+
+drop table test;
diff --git
a/sql/test/BugTracker-2013/Tests/duplicate_column_name.Bug-3349.stable.err
b/sql/test/BugTracker-2013/Tests/duplicate_column_name.Bug-3349.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/duplicate_column_name.Bug-3349.stable.err
@@ -0,0 +1,44 @@
+stderr of test 'duplicate_column_name.Bug-3349` in directory
'sql/test/BugTracker-2013` itself:
+
+
+# 10:39:09 >
+# 10:39:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32749" "--set"
"mapi_usock=/var/tmp/mtest-28423/.s.monetdb.32749" "--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"
+# 10:39:09 >
+
+# 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 = 32749
+# cmdline opt mapi_usock = /var/tmp/mtest-28423/.s.monetdb.32749
+# 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
+
+# 10:39:09 >
+# 10:39:09 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-28423" "--port=32749"
+# 10:39:09 >
+
+MAPI = (monetdb) /var/tmp/mtest-28423/.s.monetdb.32749
+QUERY = SELECT *
+ FROM (
+ SELECT a1.x, a1.y, a2.x, a2.y
+ FROM ( SELECT * FROM test) AS a1 JOIN
+ ( SELECT * FROM test) AS a2
+ ON a1.x = a2.x
+ ) AS t;
+ERROR = !SELECT: Duplicate column name 't.x'
+
+# 10:39:09 >
+# 10:39:09 > "Done."
+# 10:39:09 >
+
diff --git
a/sql/test/BugTracker-2013/Tests/duplicate_column_name.Bug-3349.stable.out
b/sql/test/BugTracker-2013/Tests/duplicate_column_name.Bug-3349.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/duplicate_column_name.Bug-3349.stable.out
@@ -0,0 +1,53 @@
+stdout of test 'duplicate_column_name.Bug-3349` in directory
'sql/test/BugTracker-2013` itself:
+
+
+# 10:39:09 >
+# 10:39:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32749" "--set"
"mapi_usock=/var/tmp/mtest-28423/.s.monetdb.32749" "--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"
+# 10:39:09 >
+
+# MonetDB 5 server v11.15.12
+# 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.775 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:32749/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-28423/.s.monetdb.32749
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 10:39:09 >
+# 10:39:09 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-28423" "--port=32749"
+# 10:39:09 >
+
+#CREATE TABLE test (x int, y int);
+#insert into test (x, y) VALUES (1, 1);
+[ 1 ]
+#insert into test (x, y) VALUES (1, 2);
+[ 1 ]
+#SELECT *
+#FROM (
+# SELECT a1.x AS x1, a1.y AS y1, a2.x AS x2, a2.y AS y2
+# FROM ( SELECT * FROM test) AS a1 JOIN
+# ( SELECT * FROM test) AS a2
+# ON a1.x = a2.x
+# ) AS t;
+% sys.t, sys.t, sys.t, sys.t # table_name
+% x1, y1, x2, y2 # name
+% int, int, int, int # type
+% 1, 1, 1, 1 # length
+[ 1, 1, 1, 1 ]
+[ 1, 1, 1, 2 ]
+[ 1, 2, 1, 1 ]
+[ 1, 2, 1, 2 ]
+#drop table test;
+
+# 10:39:09 >
+# 10:39:09 > "Done."
+# 10:39:09 >
+
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
