Changeset: 3021bad132e3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3021bad132e3
Added Files:
sql/test/BugTracker-2014/Tests/case-sqrt.Bug-3627.sql
sql/test/BugTracker-2014/Tests/case-sqrt.Bug-3627.stable.err
sql/test/BugTracker-2014/Tests/case-sqrt.Bug-3627.stable.out
sql/test/BugTracker-2014/Tests/column-with-comma.Bug-3616.sql
sql/test/BugTracker-2014/Tests/column-with-comma.Bug-3616.stable.err
sql/test/BugTracker-2014/Tests/column-with-comma.Bug-3616.stable.out
Modified Files:
sql/backends/monet5/sql_result.c
sql/test/BugTracker-2014/Tests/All
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (truncated from 358 to 300 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
@@ -1667,8 +1667,30 @@ mvc_export_head(backend *b, stream *s, i
for (i = 0; i < t->nr_cols; i++) {
res_col *c = t->cols + i;
- if (mnstr_write(s, c->name, strlen(c->name), 1) != 1)
- return -1;
+ if (strchr(c->name, ',') || strchr(c->name, ' ') ||
strchr(c->name , '\t')) {
+ if (mnstr_write(s, "\"", 1, 1) != 1)
+ return -1;
+ if (strchr(c->name, '"')) {
+ char *p;
+ for (p = c->name; *p; p++) {
+ if (*p == '"') {
+ if (mnstr_write(s, "\\", 1, 1)
!= 1)
+ return -1;
+ }
+ if (mnstr_write(s, p, 1, 1) != 1)
+ return -1;
+ }
+ } else {
+ if (mnstr_write(s, c->name, strlen(c->name), 1)
!= 1)
+ return -1;
+ }
+ if (mnstr_write(s, "\"", 1, 1) != 1)
+ return -1;
+ } else {
+ if (mnstr_write(s, c->name, strlen(c->name), 1) != 1)
+ return -1;
+ }
+
if (i + 1 < t->nr_cols && mnstr_write(s, ",\t", 2, 1) != 1)
return -1;
}
diff --git a/sql/test/BugTracker-2014/Tests/All
b/sql/test/BugTracker-2014/Tests/All
--- a/sql/test/BugTracker-2014/Tests/All
+++ b/sql/test/BugTracker-2014/Tests/All
@@ -54,3 +54,5 @@ coalesce.Bug-3616
hexadecimal_literals.Bug-3621
orderby_column_exp.Bug-3620
typecast_error.Bug-3622
+case-sqrt.Bug-3627
+column-with-comma.Bug-3616
diff --git a/sql/test/BugTracker-2014/Tests/case-sqrt.Bug-3627.sql
b/sql/test/BugTracker-2014/Tests/case-sqrt.Bug-3627.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/case-sqrt.Bug-3627.sql
@@ -0,0 +1,33 @@
+START TRANSACTION;
+
+CREATE TABLE t1 (id SERIAL, colint INT);
+
+INSERT INTO t1 (colint) VALUES (-2),(-1),(0),(1),(2);
+
+SELECT t0.id
+ ,t0.colint
+ ,SQRT(t0.colint_sq)
+ FROM (SELECT id
+ ,colint
+ ,CASE WHEN colint < 0
+ THEN -1 * colint
+ ELSE colint
+ END AS colint_sq
+ FROM t1
+ ) t0
+;
+
+SELECT t0.id
+ ,t0.colint
+ ,t0.sqrt_colint
+ FROM (SELECT id
+ ,colint
+ ,CASE WHEN colint < 0
+ THEN SQRT(-1 * colint)
+ ELSE SQRT(colint)
+ END AS sqrt_colint
+ FROM t1
+ ) t0
+;
+
+ROLLBACK;
diff --git a/sql/test/BugTracker-2014/Tests/case-sqrt.Bug-3627.stable.err
b/sql/test/BugTracker-2014/Tests/case-sqrt.Bug-3627.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/case-sqrt.Bug-3627.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'case-sqrt.Bug-3627` in directory 'sql/test/BugTracker-2014`
itself:
+
+
+# 15:36:02 >
+# 15:36:02 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33717" "--set"
"mapi_usock=/var/tmp/mtest-29576/.s.monetdb.33717" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 15:36:02 >
+
+# builtin opt gdk_dbpath =
/ufs/sjoerd/Monet-candidate/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 = 33717
+# cmdline opt mapi_usock = /var/tmp/mtest-29576/.s.monetdb.33717
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2014
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 15:36:03 >
+# 15:36:03 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-29576" "--port=33717"
+# 15:36:03 >
+
+
+# 15:36:03 >
+# 15:36:03 > "Done."
+# 15:36:03 >
+
diff --git a/sql/test/BugTracker-2014/Tests/case-sqrt.Bug-3627.stable.out
b/sql/test/BugTracker-2014/Tests/case-sqrt.Bug-3627.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/case-sqrt.Bug-3627.stable.out
@@ -0,0 +1,108 @@
+stdout of test 'case-sqrt.Bug-3627` in directory 'sql/test/BugTracker-2014`
itself:
+
+
+# 15:36:02 >
+# 15:36:02 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33717" "--set"
"mapi_usock=/var/tmp/mtest-29576/.s.monetdb.33717" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 15:36:02 >
+
+# MonetDB 5 server v11.19.8 (hg id: 6df8d6da2ac3)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2014', 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-2014 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:33717/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-29576/.s.monetdb.33717
+# 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
+
+# 15:36:03 >
+# 15:36:03 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-29576" "--port=33717"
+# 15:36:03 >
+
+#START TRANSACTION;
+#CREATE TABLE t1 (id SERIAL, colint INT);
+#INSERT INTO t1 (colint) VALUES (-2),(-1),(0),(1),(2);
+[ 5 ]
+#SELECT t0.id
+# ,t0.colint
+# ,SQRT(t0.colint_sq)
+# FROM (SELECT id
+# ,colint
+# ,CASE WHEN colint < 0
+# THEN -1 * colint
+# ELSE colint
+# END AS colint_sq
+# FROM t1
+# ) t0
+#;
+% sys.t0, sys.t0, sys.L # table_name
+% id, colint, sqrt_colint_sq # name
+% int, int, double # type
+% 1, 2, 24 # length
+[ 1, -2, 1.414213562 ]
+[ 2, -1, 1 ]
+[ 3, 0, 0 ]
+[ 4, 1, 1 ]
+[ 5, 2, 1.414213562 ]
+#SELECT t0.id
+# ,t0.colint
+# ,SQRT(t0.colint_sq)
+# FROM (SELECT id
+# ,colint
+# ,CASE WHEN colint < 0
+# THEN -1 * colint
+# ELSE colint
+# END AS colint_sq
+# FROM t1
+# ) t0
+#;
+#% sys.t0, sys.t0, sys.t0 # table_name
+% id, colint, sqrt_colint # name
+% int, int, double # type
+% 1, 2, 24 # length
+[ 1, -2, 1.414213562 ]
+[ 2, -1, 1 ]
+[ 3, 0, 0 ]
+[ 4, 1, 1 ]
+[ 5, 2, 1.414213562 ]
+#ROLLBACK;
+
+# 15:36:03 >
+# 15:36:03 > "Done."
+# 15:36:03 >
+
diff --git a/sql/test/BugTracker-2014/Tests/column-with-comma.Bug-3616.sql
b/sql/test/BugTracker-2014/Tests/column-with-comma.Bug-3616.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/column-with-comma.Bug-3616.sql
@@ -0,0 +1,1 @@
+select 1 as "a,b", 2 as c;
diff --git
a/sql/test/BugTracker-2014/Tests/column-with-comma.Bug-3616.stable.err
b/sql/test/BugTracker-2014/Tests/column-with-comma.Bug-3616.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/column-with-comma.Bug-3616.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'column-with-comma.Bug-3616` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 17:14:20 >
+# 17:14:20 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34835" "--set"
"mapi_usock=/var/tmp/mtest-28582/.s.monetdb.34835" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 17:14:20 >
+
+# builtin opt gdk_dbpath =
/ufs/sjoerd/Monet-candidate/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 = 34835
+# cmdline opt mapi_usock = /var/tmp/mtest-28582/.s.monetdb.34835
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2014
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 17:14:21 >
+# 17:14:21 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-28582" "--port=34835"
+# 17:14:21 >
+
+
+# 17:14:21 >
+# 17:14:21 > "Done."
+# 17:14:21 >
+
diff --git
a/sql/test/BugTracker-2014/Tests/column-with-comma.Bug-3616.stable.out
b/sql/test/BugTracker-2014/Tests/column-with-comma.Bug-3616.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/column-with-comma.Bug-3616.stable.out
@@ -0,0 +1,67 @@
+stdout of test 'column-with-comma.Bug-3616` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 17:14:20 >
+# 17:14:20 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34835" "--set"
"mapi_usock=/var/tmp/mtest-28582/.s.monetdb.34835" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 17:14:20 >
+
+# MonetDB 5 server v11.19.8 (hg id: 682d22ac9255+)
+# This is an unreleased version
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
