Changeset: 2d3b6c5615b2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2d3b6c5615b2
Added Files:
sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.stable.out
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-not-in.Bug-6594.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.sql
Branch: remote_auth
Log Message:
Merge with default
diffs (207 lines):
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -1509,7 +1509,7 @@ sql_update_mar2018_sp1(Client c, mvc *sq
char *schema = stack_get_string(sql, "current_schema");
if (buf == NULL)
- throw(SQL, "sql_update_dec2016_sp3", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ throw(SQL, "sql_update_mar2018_sp1", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
pos += snprintf(buf + pos, bufsize - pos,
"set schema \"sys\";\n"
"drop function
sys.dependencies_functions_os_triggers();\n"
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-not-in.Bug-6594.stable.out
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-not-in.Bug-6594.stable.out
---
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-not-in.Bug-6594.stable.out
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-not-in.Bug-6594.stable.out
@@ -29,7 +29,7 @@ Ready.
#ELSE NULL END ) AS BIGINT) AS col2;
% .L14 # table_name
% col2 # name
-% bigint # type
+% hugeint # type
% 1 # length
[ NULL ]
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.out
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.out
---
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.out
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.out
@@ -28,11 +28,11 @@ Ready.
#INSERT INTO tab0 VALUES (97,1,99), (15,81,47), (87,21,10);
[ 3 ]
#SELECT ALL - ( - COUNT ( * ) ) FROM tab0 AS cor0 WHERE col0 / ( - + col2 )
NOT IN ( + + col0, + col0 * + ( col1 ), + ( + - col0 ) * - 45, + CAST ( NULL AS
INTEGER ) );
-% sys.L34 # table_name
-% L34 # name
+% sys.L31 # table_name
+% L31 # name
% bigint # type
% 1 # length
-[ 3 ]
+[ 0 ]
#DROP TABLE tab0;
# 19:12:39 >
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.sql
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.sql
---
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.sql
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.sql
@@ -2,3 +2,22 @@ CREATE TABLE tab2(col0 INTEGER, col1 INT
INSERT INTO tab2 VALUES(64,77,40),(75,67,58),(46,51,23);
SELECT * FROM tab2 WHERE + col2 NOT IN ( + - 59 + + ( 76 ), col1, + CAST (
NULL AS INTEGER ), col1, - 19, col1 );
DROP TABLE tab2;
+
+CREATE TABLE CITIES(CITY varchar(50) NULL);
+INSERT INTO CITIES
+ SELECT 'Paris' UNION ALL
+ SELECT 'Montreal' UNION ALL
+ SELECT 'New York' UNION ALL
+ SELECT NULL;
+
+SELECT 'Found Montreal' WHERE 'Montreal' IN (SELECT city from CITIES);
+SELECT 'Found Sidney' WHERE 'Sidney' IN (SELECT city from CITIES);
+SELECT 'Sidney Not Found' WHERE 'Sidney' NOT IN (SELECT city from CITIES);
+SELECT 'Sidney Not Found' WHERE 'Sidney' NOT IN ('Paris','Montreal','New
York');
+SELECT 'Sidney Not Found' WHERE 'Sidney' NOT IN ('Paris','Montreal','New
York', NULL);
+SELECT 'Sidney Not Found' WHERE 'Sidney'<>'Paris' AND 'Sidney'<>'Montreal';
+SELECT 'Sidney Not Found' WHERE 'Sidney'<>'Paris' AND 'Sidney'<>'Montreal' AND
'Sidney'<>null;
+
+SELECT city from CITIES WHERE city in (select city from CITIES);
+--SELECT 'Sidney Not Found' WHERE NOT EXISTS (SELECT 1/0 FROM CITIES WHERE
CITY = 'Sidney');
+drop table CITIES;
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.stable.err
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'sqlitelogictest-select-not-in-wrong.Bug-6602` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 21:00:27 >
+# 21:00:27 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31602" "--set"
"mapi_usock=/var/tmp/mtest-15721/.s.monetdb.31602" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/hrel/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_c=true"
+# 21:00:27 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-old/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 = 31602
+# cmdline opt mapi_usock = /var/tmp/mtest-15721/.s.monetdb.31602
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/hrel/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018
+# cmdline opt embedded_c = true
+# cmdline opt gdk_debug = 553648138
+
+# 21:00:27 >
+# 21:00:27 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-15721" "--port=31602"
+# 21:00:27 >
+
+
+# 21:00:27 >
+# 21:00:27 > "Done."
+# 21:00:27 >
+
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.stable.out
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-not-in-wrong.Bug-6602.stable.out
@@ -0,0 +1,94 @@
+stdout of test 'sqlitelogictest-select-not-in-wrong.Bug-6602` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 21:00:27 >
+# 21:00:27 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31602" "--set"
"mapi_usock=/var/tmp/mtest-15721/.s.monetdb.31602" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/hrel/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_c=true"
+# 21:00:27 >
+
+# MonetDB 5 server v11.29.4
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2018', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 15.386 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://da200:31602/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-15721/.s.monetdb.31602
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 21:00:27 >
+# 21:00:27 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-15721" "--port=31602"
+# 21:00:27 >
+
+#CREATE TABLE tab2(col0 INTEGER, col1 INTEGER, col2 INTEGER);
+#INSERT INTO tab2 VALUES(64,77,40),(75,67,58),(46,51,23);
+[ 3 ]
+#SELECT * FROM tab2 WHERE + col2 NOT IN ( + - 59 + + ( 76 ), col1, + CAST (
NULL AS INTEGER ), col1, - 19, col1 );
+% sys.tab2, sys.tab2, sys.tab2 # table_name
+% col0, col1, col2 # name
+% int, int, int # type
+% 1, 1, 1 # length
+#DROP TABLE tab2;
+#CREATE TABLE CITIES(CITY varchar(50) NULL);
+#INSERT INTO CITIES
+# SELECT 'Paris' UNION ALL
+# SELECT 'Montreal' UNION ALL
+# SELECT 'New York' UNION ALL
+# SELECT NULL;
+[ 4 ]
+#SELECT 'Found Montreal' WHERE 'Montreal' IN (SELECT city from CITIES);
+% .L4 # table_name
+% L4 # name
+% char # type
+% 14 # length
+[ "Found Montreal" ]
+#SELECT 'Found Sidney' WHERE 'Sidney' IN (SELECT city from CITIES);
+% .L4 # table_name
+% L4 # name
+% char # type
+% 12 # length
+#SELECT 'Sidney Not Found' WHERE 'Sidney' NOT IN (SELECT city from CITIES);
+% .L4 # table_name
+% L4 # name
+% char # type
+% 16 # length
+#SELECT 'Sidney Not Found' WHERE 'Sidney' NOT IN ('Paris','Montreal','New
York');
+% .L2 # table_name
+% L2 # name
+% char # type
+% 16 # length
+[ "Sidney Not Found" ]
+#SELECT 'Sidney Not Found' WHERE 'Sidney' NOT IN ('Paris','Montreal','New
York', NULL);
+% .L2 # table_name
+% L2 # name
+% char # type
+% 16 # length
+#SELECT 'Sidney Not Found' WHERE 'Sidney'<>'Paris' AND 'Sidney'<>'Montreal';
+% .L2 # table_name
+% L2 # name
+% char # type
+% 16 # length
+[ "Sidney Not Found" ]
+#SELECT 'Sidney Not Found' WHERE 'Sidney'<>'Paris' AND 'Sidney'<>'Montreal'
AND 'Sidney'<>null;
+% .L2 # table_name
+% L2 # name
+% char # type
+% 16 # length
+#SELECT city from CITIES WHERE city in (select city from CITIES);
+% sys.cities # table_name
+% city # name
+% varchar # type
+% 8 # length
+[ "Paris" ]
+[ "Montreal" ]
+[ "New York" ]
+#drop table CITIES;
+
+# 21:00:27 >
+# 21:00:27 > "Done."
+# 21:00:27 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
