Changeset: dca3d2f676ed for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dca3d2f676ed
Added Files:
sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.sql
sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.err
sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out
Modified Files:
sql/server/rel_optimizer.c
sql/test/BugTracker-2016/Tests/All
Branch: Jul2015
Log Message:
fixed bug 3974, ie rename expression properly
diffs (145 lines):
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -1711,8 +1711,33 @@ rel_no_rename_exps( list *exps )
static void
rel_rename_exps( mvc *sql, list *exps1, list *exps2)
{
+ int pos = 0;
node *n, *m;
+ /* check if a column uses an alias earlier in the list */
+ for (n = exps1->h, m = exps2->h; n && m; n = n->next, m = m->next,
pos++) {
+ sql_exp *e2 = m->data;
+
+ if (e2->type == e_column) {
+ sql_exp *ne = NULL;
+
+ if (e2->l)
+ ne = exps_bind_column2(exps2, e2->l, e2->r);
+ if (!ne && !e2->l)
+ ne = exps_bind_column(exps2, e2->r, NULL);
+ if (ne) {
+ int p = list_position(exps2, ne);
+
+ if (p < pos) {
+ ne = list_fetch(exps1, p);
+ if (e2->l)
+ e2->l = exp_relname(ne);
+ e2->r = exp_name(ne);
+ }
+ }
+ }
+ }
+
assert(list_length(exps1) == list_length(exps2));
for (n = exps1->h, m = exps2->h; n && m; n = n->next, m = m->next) {
sql_exp *e1 = n->data;
diff --git a/sql/test/BugTracker-2016/Tests/All
b/sql/test/BugTracker-2016/Tests/All
--- a/sql/test/BugTracker-2016/Tests/All
+++ b/sql/test/BugTracker-2016/Tests/All
@@ -14,3 +14,4 @@ update_crash.Bug-3954
merge_project.Bug-3955
decimal_vs_integer.Bug-3941
foreign_key.Bug-3938
+rename_exps.Bug-3974
diff --git a/sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.sql
b/sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.sql
@@ -0,0 +1,3 @@
+create table foo (a int, b int);
+prepare select count(b) from (select a,b from foo union all select null,null
from foo) t;
+drop table foo;
diff --git a/sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.err
b/sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'rename_exps.Bug-3974` in directory 'sql/test/BugTracker-2016`
itself:
+
+
+# 12:27:17 >
+# 12:27:17 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39847" "--set"
"mapi_usock=/var/tmp/mtest-21445/.s.monetdb.39847" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 12:27:17 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-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 = 39847
+# cmdline opt mapi_usock = /var/tmp/mtest-21445/.s.monetdb.39847
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 12:27:17 >
+# 12:27:17 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-21445" "--port=39847"
+# 12:27:17 >
+
+
+# 12:27:17 >
+# 12:27:17 > "Done."
+# 12:27:17 >
+
diff --git a/sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out
b/sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out
@@ -0,0 +1,45 @@
+stdout of test 'rename_exps.Bug-3974` in directory 'sql/test/BugTracker-2016`
itself:
+
+
+# 12:27:17 >
+# 12:27:17 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39847" "--set"
"mapi_usock=/var/tmp/mtest-21445/.s.monetdb.39847" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 12:27:17 >
+
+# MonetDB 5 server v11.21.18
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2016', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 7.332 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:39847/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-21445/.s.monetdb.39847
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.11'
+# Finished reading the write-ahead log 'sql_logs/sql/log.11'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 12:27:17 >
+# 12:27:17 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-21445" "--port=39847"
+# 12:27:17 >
+
+#create table foo (a int, b int);
+#prepare select count(b) from (select a,b from foo union all select null,null
from foo) t;
+#prepare select count(b) from (select a,b from foo union all select null,null
from foo) t;
+% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
+% type, digits, scale, schema, table, column # name
+% varchar, int, int, str, str, str # type
+% 3, 2, 1, 0, 2, 2 # length
+[ "wrd", 64, 0, "", "L3", "L3" ]
+#drop table foo;
+
+# 12:27:17 >
+# 12:27:17 > "Done."
+# 12:27:17 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
