Changeset: adc55890ccd7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=adc55890ccd7
Added Files:
sql/test/BugTracker-2016/Tests/simpletest.stable.err
sql/test/BugTracker-2016/Tests/simpletest.stable.out
Modified Files:
sql/server/rel_select.c
sql/test/BugTracker-2016/Tests/like_in_non_sys_schema.Bug-4062.stable.err
sql/test/BugTracker-2016/Tests/like_in_non_sys_schema.Bug-4062.stable.out
sql/test/BugTracker-2016/Tests/simpletest.sql
Branch: default
Log Message:
search for (i)like functions in the sys schema
fixed simpletest.sql + added stable output
diffs (156 lines):
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -2100,6 +2100,7 @@ rel_logical_value_exp(mvc *sql, sql_rel
sql_exp *le = rel_value_exp(sql, rel, lo, f, ek);
sql_exp *re, *ee = NULL;
char *like = insensitive ? (anti ? "not_ilike" : "ilike") :
(anti ? "not_like" : "like");
+ sql_schema *sys = mvc_bind_schema(sql, "sys");
if (!le)
return NULL;
@@ -2126,8 +2127,8 @@ rel_logical_value_exp(mvc *sql, sql_rel
ee = exp_atom(sql->sa, atom_string(sql->sa, st,
sa_strdup(sql->sa, escape)));
}
if (ee)
- return rel_nop_(sql, le, re, ee, NULL, NULL, like,
card_value);
- return rel_binop_(sql, le, re, NULL, like, card_value);
+ return rel_nop_(sql, le, re, ee, NULL, sys, like,
card_value);
+ return rel_binop_(sql, le, re, sys, like, card_value);
}
case SQL_BETWEEN:
case SQL_NOT_BETWEEN:
diff --git
a/sql/test/BugTracker-2016/Tests/like_in_non_sys_schema.Bug-4062.stable.err
b/sql/test/BugTracker-2016/Tests/like_in_non_sys_schema.Bug-4062.stable.err
--- a/sql/test/BugTracker-2016/Tests/like_in_non_sys_schema.Bug-4062.stable.err
+++ b/sql/test/BugTracker-2016/Tests/like_in_non_sys_schema.Bug-4062.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'like_in_non_sys_schema.Bug-4061` in directory
'sql/test/BugTracker-2016` itself:
+stderr of test 'like_in_non_sys_schema.Bug-4062` in directory
'sql/test/BugTracker-2016` itself:
# 15:05:36 >
diff --git
a/sql/test/BugTracker-2016/Tests/like_in_non_sys_schema.Bug-4062.stable.out
b/sql/test/BugTracker-2016/Tests/like_in_non_sys_schema.Bug-4062.stable.out
--- a/sql/test/BugTracker-2016/Tests/like_in_non_sys_schema.Bug-4062.stable.out
+++ b/sql/test/BugTracker-2016/Tests/like_in_non_sys_schema.Bug-4062.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'like_in_non_sys_schema.Bug-4061` in directory
'sql/test/BugTracker-2016` itself:
+stdout of test 'like_in_non_sys_schema.Bug-4062` in directory
'sql/test/BugTracker-2016` itself:
# 15:05:36 >
diff --git a/sql/test/BugTracker-2016/Tests/simpletest.sql
b/sql/test/BugTracker-2016/Tests/simpletest.sql
--- a/sql/test/BugTracker-2016/Tests/simpletest.sql
+++ b/sql/test/BugTracker-2016/Tests/simpletest.sql
@@ -1,6 +1,6 @@
create table simple1(i integer);
-insert into simple values(1);
+insert into simple1 values(1);
create procedure correct()
begin
diff --git a/sql/test/BugTracker-2016/Tests/simpletest.stable.err
b/sql/test/BugTracker-2016/Tests/simpletest.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/simpletest.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'simpletest` in directory 'sql/test/BugTracker-2016` itself:
+
+
+# 16:55:42 >
+# 16:55:42 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32697" "--set"
"mapi_usock=/var/tmp/mtest-10598/.s.monetdb.32697" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016"
+# 16:55:42 >
+
+# builtin opt gdk_dbpath =
/export/scratch1/home/niels/scratch/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 = 32697
+# cmdline opt mapi_usock = /var/tmp/mtest-10598/.s.monetdb.32697
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/export/scratch1/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016
+# cmdline opt gdk_debug = 536870922
+
+# 16:55:42 >
+# 16:55:42 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-10598" "--port=32697"
+# 16:55:42 >
+
+
+# 16:55:43 >
+# 16:55:43 > "Done."
+# 16:55:43 >
+
diff --git a/sql/test/BugTracker-2016/Tests/simpletest.stable.out
b/sql/test/BugTracker-2016/Tests/simpletest.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/simpletest.stable.out
@@ -0,0 +1,61 @@
+stdout of test 'simpletest` in directory 'sql/test/BugTracker-2016` itself:
+
+
+# 16:55:42 >
+# 16:55:42 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32697" "--set"
"mapi_usock=/var/tmp/mtest-10598/.s.monetdb.32697" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016"
+# 16:55:42 >
+
+# MonetDB 5 server v11.24.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2016', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 15.584 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://rocks002.scilens.private:32697/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-10598/.s.monetdb.32697
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 16:55:42 >
+# 16:55:42 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-10598" "--port=32697"
+# 16:55:42 >
+
+#create table simple1(i integer);
+#insert into simple1 values(1);
+[ 1 ]
+#create procedure correct()
+#begin
+# declare b boolean;
+# declare i integer;
+# set i = (select count(*));
+# set b= (i>0);
+# if (b)
+# then
+# insert into simple1 values(2);
+# end if;
+#end;
+#create procedure correct1()
+#begin
+# declare b boolean;
+# set b= (select count(*)>0);
+# if (b)
+# then
+# insert into simple1 values(2);
+# end if;
+#end;
+#create procedure wrong2()
+#begin
+# if (select count(*)>0)
+# then
+# insert into simple1 values(3);
+# end if;
+#end;
+
+# 16:55:43 >
+# 16:55:43 > "Done."
+# 16:55:43 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
