Changeset: 72699051b01e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=72699051b01e
Added Files:
sql/test/BugTracker-2014/Tests/BOM-in-string.Bug-3641.sql
sql/test/BugTracker-2014/Tests/BOM-in-string.Bug-3641.stable.err
sql/test/BugTracker-2014/Tests/BOM-in-string.Bug-3641.stable.out
Modified Files:
sql/server/sql_scan.c
sql/test/BugTracker-2014/Tests/All
Branch: Oct2014
Log Message:
The server should not treat U+FEFF specially, that's an interface issue.
This fixes bug 3641.
Also added test.
diffs (160 lines):
diff --git a/sql/server/sql_scan.c b/sql/server/sql_scan.c
--- a/sql/server/sql_scan.c
+++ b/sql/server/sql_scan.c
@@ -557,19 +557,6 @@ scanner_getc(struct scanner *lc)
goto error;
}
- /* if we find a BOM interpret it as a "zero-width non-breaking
- * space" by just skipping it */
- if (c == 0xFEFF) {
- /* shift stuff so we won't "see" this BOM when it's in the
- * middle of some word */
- memmove(b->buf + b->pos + 3, b->buf + b->pos, lc->yycur - 3);
- for (n = 0; n < 3; n++) {
- b->buf[b->pos++] = ' ';
- lc->yycur--;
- }
- return(scanner_getc(lc));
- }
-
return c;
error:
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
@@ -62,3 +62,4 @@ ifthenelse.Bug-3629
order_by_incorrect_error.Bug-3630
incorrect_floating_point_cast.Bug-3633
acidity-fail.Bug-3635
+BOM-in-string.Bug-3641
diff --git a/sql/test/BugTracker-2014/Tests/BOM-in-string.Bug-3641.sql
b/sql/test/BugTracker-2014/Tests/BOM-in-string.Bug-3641.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/BOM-in-string.Bug-3641.sql
@@ -0,0 +1,4 @@
+-- careful: the second query contains the code U+FEFF or ZERO WIDTH
+-- NO-BREAK SPACE, also known as BYTE ORDER MARK
+select ' ';
+select ' ';
diff --git a/sql/test/BugTracker-2014/Tests/BOM-in-string.Bug-3641.stable.err
b/sql/test/BugTracker-2014/Tests/BOM-in-string.Bug-3641.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/BOM-in-string.Bug-3641.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'BOM-in-string.Bug-3641` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 09:45:17 >
+# 09:45:17 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37240" "--set"
"mapi_usock=/var/tmp/mtest-27530/.s.monetdb.37240" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 09:45:17 >
+
+# builtin opt gdk_dbpath = /home/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 = 37240
+# cmdline opt mapi_usock = /var/tmp/mtest-27530/.s.monetdb.37240
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2014
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 09:45:18 >
+# 09:45:18 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-27530" "--port=37240"
+# 09:45:18 >
+
+
+# 09:45:18 >
+# 09:45:18 > "Done."
+# 09:45:18 >
+
diff --git a/sql/test/BugTracker-2014/Tests/BOM-in-string.Bug-3641.stable.out
b/sql/test/BugTracker-2014/Tests/BOM-in-string.Bug-3641.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/BOM-in-string.Bug-3641.stable.out
@@ -0,0 +1,73 @@
+stdout of test 'BOM-in-string.Bug-3641` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 09:47:46 >
+# 09:47:46 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35607" "--set"
"mapi_usock=/var/tmp/mtest-27606/.s.monetdb.35607" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 09:47:46 >
+
+# MonetDB 5 server v11.19.8 (hg id: 9a2cf4c75ba5+)
+# 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 7.734 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://gaai.mullender.nl:35607/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-27606/.s.monetdb.35607
+# 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
+
+# 09:47:46 >
+# 09:47:46 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-27606" "--port=35607"
+# 09:47:46 >
+
+#select ' ';
+% .L # table_name
+% single_value # name
+% char # type
+% 2 # length
+[ " " ]
+#select ' ';
+% .L # table_name
+% single_value # name
+% char # type
+% 5 # length
+[ " " ]
+
+# 09:47:46 >
+# 09:47:46 > "Done."
+# 09:47:46 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
