Changeset: 6e51939fcef0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6e51939fcef0
Added Files:
sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.sql
sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.stable.err
sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.stable.out
Modified Files:
sql/backends/monet5/sql_result.c
sql/test/BugTracker-2015/Tests/All
Branch: Oct2014
Log Message:
Escape # in column name.
This fixes bug 3467.
diffs (147 lines):
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -1586,7 +1586,7 @@ mvc_export_head(backend *b, stream *s, i
for (i = 0; i < t->nr_cols; i++) {
res_col *c = t->cols + i;
- if (strchr(c->name, ',') || strchr(c->name, ' ') ||
strchr(c->name , '\t')) {
+ if (strchr(c->name, ',') || strchr(c->name, ' ') ||
strchr(c->name , '\t') || strchr(c->name, '#')) {
if (mnstr_write(s, "\"", 1, 1) != 1)
return -1;
if (strchr(c->name, '"')) {
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
@@ -1,1 +1,2 @@
inet-ordering.Bug-3646
+sharp-alias.Bug-3467
diff --git a/sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.sql
b/sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.sql
@@ -0,0 +1,4 @@
+CREATE TABLE test3467 (a int);
+SELECT a AS "#" FROM test3467;
+SELECT a AS "@" FROM test3467;
+DROP TABLE test3467;
diff --git a/sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.stable.err
b/sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'sharp-alias.Bug-3467` in directory 'sql/test/BugTracker-2015`
itself:
+
+
+# 14:38:25 >
+# 14:38:25 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33653" "--set"
"mapi_usock=/var/tmp/mtest-3931/.s.monetdb.33653" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 14:38:25 >
+
+# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-stable/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 = 33653
+# cmdline opt mapi_usock = /var/tmp/mtest-3931/.s.monetdb.33653
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 14:38:25 >
+# 14:38:25 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-3931" "--port=33653"
+# 14:38:25 >
+
+
+# 14:38:26 >
+# 14:38:26 > "Done."
+# 14:38:26 >
+
diff --git a/sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.stable.out
b/sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.stable.out
@@ -0,0 +1,73 @@
+stdout of test 'sharp-alias.Bug-3467` in directory 'sql/test/BugTracker-2015`
itself:
+
+
+# 14:38:25 >
+# 14:38:25 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33653" "--set"
"mapi_usock=/var/tmp/mtest-3931/.s.monetdb.33653" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 14:38:25 >
+
+# MonetDB 5 server v11.19.8 (hg id: f81a9bd3789b+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.590 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://madrid.ins.cwi.nl:33653/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-3931/.s.monetdb.33653
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 19_cluster.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 41_jsonstore.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_gsl.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 99_system.sql
+
+# 14:38:25 >
+# 14:38:25 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-3931" "--port=33653"
+# 14:38:25 >
+
+#CREATE TABLE test3467 (a int);
+#SELECT a AS "#" FROM test3467;
+% sys.L # table_name
+% "#" # name
+% int # type
+% 1 # length
+#SELECT a AS "@" FROM test3467;
+% sys.L # table_name
+% @ # name
+% int # type
+% 1 # length
+#DROP TABLE test3467;
+
+# 14:38:26 >
+# 14:38:26 > "Done."
+# 14:38:26 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
