Changeset: c47c58f29320 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c47c58f29320
Added Files:
sql/test/BugTracker-2017/Tests/createorreplace-system-func.Bug-6499.sql
sql/test/BugTracker-2017/Tests/createorreplace-system-func.Bug-6499.stable.err
sql/test/BugTracker-2017/Tests/createorreplace-system-func.Bug-6499.stable.out
Modified Files:
sql/server/rel_psm.c
sql/test/BugTracker-2017/Tests/All
Branch: Jul2017
Log Message:
corrected fix for bug 6499, ie only disallow system functions (not all)
diffs (105 lines):
diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c
--- a/sql/server/rel_psm.c
+++ b/sql/server/rel_psm.c
@@ -809,7 +809,7 @@ rel_create_func(mvc *sql, dlist *qname,
}
if (mvc_check_dependency(sql, func->base.id,
!IS_PROC(func) ? FUNC_DEPENDENCY : PROC_DEPENDENCY, NULL))
return sql_error(sql, 02, "CREATE OR REPLACE
%s%s: there are database objects dependent on %s%s %s;", KF, F, kf, fn,
func->base.name);
- if (!sf->sname) {
+ if (!func->s) {
return sql_error(sql, 02, "CREATE OR REPLACE
%s%s: not allowed to replace system %s%s %s;", KF, F, kf, fn, func->base.name);
}
diff --git a/sql/test/BugTracker-2017/Tests/All
b/sql/test/BugTracker-2017/Tests/All
--- a/sql/test/BugTracker-2017/Tests/All
+++ b/sql/test/BugTracker-2017/Tests/All
@@ -107,3 +107,4 @@ sqlitelogictest-algebra-operators.Bug-64
sqlitelogictest-hidden-alias.Bug-6495
sqlitelogictest-comparisons-between-floating-points-and-NULL.Bug-6496
sqlitelogictest-not-between.Bug-6497
+createorreplace-system-func.Bug-6499
diff --git
a/sql/test/BugTracker-2017/Tests/createorreplace-system-func.Bug-6499.sql
b/sql/test/BugTracker-2017/Tests/createorreplace-system-func.Bug-6499.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/createorreplace-system-func.Bug-6499.sql
@@ -0,0 +1,2 @@
+CREATE OR REPLACE FUNCTION levenshtein(s1 string, s2 string) RETURNS integer
EXTERNAL NAME mdb."levenshtein_utf8";
+
diff --git
a/sql/test/BugTracker-2017/Tests/createorreplace-system-func.Bug-6499.stable.err
b/sql/test/BugTracker-2017/Tests/createorreplace-system-func.Bug-6499.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2017/Tests/createorreplace-system-func.Bug-6499.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'createorreplace-system-func.Bug-6499` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 12:24:14 >
+# 12:24:14 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38213" "--set"
"mapi_usock=/var/tmp/mtest-10252/.s.monetdb.38213" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 12:24:14 >
+
+# 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 = 38213
+# cmdline opt mapi_usock = /var/tmp/mtest-10252/.s.monetdb.38213
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017
+# cmdline opt gdk_debug = 553648138
+
+# 12:24:14 >
+# 12:24:14 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-10252" "--port=38213"
+# 12:24:14 >
+
+MAPI = (monetdb) /var/tmp/mtest-10252/.s.monetdb.38213
+QUERY = CREATE OR REPLACE FUNCTION levenshtein(s1 string, s2 string) RETURNS
integer EXTERNAL NAME mdb."levenshtein_utf8";
+ERROR = !CREATE OR REPLACE FUNCTION: not allowed to replace system function
levenshtein;
+
+# 12:24:14 >
+# 12:24:14 > "Done."
+# 12:24:14 >
+
diff --git
a/sql/test/BugTracker-2017/Tests/createorreplace-system-func.Bug-6499.stable.out
b/sql/test/BugTracker-2017/Tests/createorreplace-system-func.Bug-6499.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2017/Tests/createorreplace-system-func.Bug-6499.stable.out
@@ -0,0 +1,31 @@
+stdout of test 'createorreplace-system-func.Bug-6499` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 12:24:14 >
+# 12:24:14 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38213" "--set"
"mapi_usock=/var/tmp/mtest-10252/.s.monetdb.38213" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 12:24:14 >
+
+# MonetDB 5 server v11.27.6
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2017', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 7.330 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:38213/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-10252/.s.monetdb.38213
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 12:24:14 >
+# 12:24:14 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-10252" "--port=38213"
+# 12:24:14 >
+
+
+# 12:24:14 >
+# 12:24:14 > "Done."
+# 12:24:14 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
