Changeset: 4aee2a208fac for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4aee2a208fac
Added Files:
sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.sql
sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.stable.err
sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.stable.out
Modified Files:
monetdb5/modules/mal/pcre.c
sql/test/BugTracker-2015/Tests/All
Branch: Jul2015
Log Message:
Fix LIKE operator to default to empty ESCAPE.
This fixes bug 3822 (although perhaps not in the way the reported had
originally envisioned).
diffs (170 lines):
diff --git a/monetdb5/modules/mal/pcre.c b/monetdb5/modules/mal/pcre.c
--- a/monetdb5/modules/mal/pcre.c
+++ b/monetdb5/modules/mal/pcre.c
@@ -1041,7 +1041,7 @@ PCRElike3(bit *ret, const str *s, const
str
PCRElike2(bit *ret, const str *s, const str *pat)
{
- char *esc = "\\";
+ char *esc = "";
return PCRElike3(ret, s, pat, &esc);
}
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
@@ -71,3 +71,4 @@ crash_timestamp_convert.Bug-3816
crash_in_reduce_groupby.Bug-3818
duplicate-constraint.Bug-3820
case_type.Bug-3821
+like-escape.Bug-3822
diff --git a/sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.sql
b/sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.sql
@@ -0,0 +1,4 @@
+select '_' like '\\_';
+select '_' like '\\_' escape '\\';
+select * from (select '_' as foo) AS t0 WHERE foo LIKE '\\_';
+select * from (select '_' as foo) AS t0 WHERE foo LIKE '\\_' escape '\\';
diff --git a/sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.stable.err
b/sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'like-escape.Bug-3822` in directory 'sql/test/BugTracker-2015`
itself:
+
+
+# 16:42:21 >
+# 16:42:21 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34019" "--set"
"mapi_usock=/var/tmp/mtest-11859/.s.monetdb.34019" "--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"
+# 16:42:21 >
+
+# 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 = 34019
+# cmdline opt mapi_usock = /var/tmp/mtest-11859/.s.monetdb.34019
+# 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
+
+# 16:42:22 >
+# 16:42:22 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11859" "--port=34019"
+# 16:42:22 >
+
+
+# 16:42:22 >
+# 16:42:22 > "Done."
+# 16:42:22 >
+
diff --git a/sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.stable.out
b/sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.stable.out
@@ -0,0 +1,94 @@
+stdout of test 'like-escape.Bug-3822` in directory 'sql/test/BugTracker-2015`
itself:
+
+
+# 16:42:21 >
+# 16:42:21 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34019" "--set"
"mapi_usock=/var/tmp/mtest-11859/.s.monetdb.34019" "--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"
+# 16:42:21 >
+
+# MonetDB 5 server v11.21.6 (hg id: 80b049a4c169+)
+# 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 and 128bit
integers 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:34019/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-11859/.s.monetdb.34019
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Finished processing logs sql/sql_logs
+# 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: 17_temporal.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: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.sql
+# loading sql script: 41_md5sum.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_gsl.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 74_netcdf.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 80_udf_hge.sql
+# loading sql script: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+
+# 16:42:22 >
+# 16:42:22 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11859" "--port=34019"
+# 16:42:22 >
+
+#select '_' like '\\_';
+% .L # table_name
+% like_single_value # name
+% boolean # type
+% 5 # length
+[ false ]
+#select '_' like '\\_' escape '\\';
+% .L # table_name
+% like_single_value # name
+% boolean # type
+% 5 # length
+[ true ]
+#select * from (select '_' as foo) AS t0 WHERE foo LIKE '\\_';
+% .t0 # table_name
+% foo # name
+% char # type
+% 1 # length
+#select * from (select '_' as foo) AS t0 WHERE foo LIKE '\\_' escape '\\';
+% .t0 # table_name
+% foo # name
+% char # type
+% 1 # length
+[ "_" ]
+
+# 16:42:22 >
+# 16:42:22 > "Done."
+# 16:42:22 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
