Changeset: 15f3671d169e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/15f3671d169e
Branch: ascii-flag
Log Message:
Merge with default branch.
diffs (truncated from 323 to 300 lines):
diff --git a/clients/examples/C/streamcat.c b/clients/examples/C/streamcat.c
--- a/clients/examples/C/streamcat.c
+++ b/clients/examples/C/streamcat.c
@@ -439,6 +439,10 @@ opener_rastream(char *filename)
#ifdef HAVE_CURL
#include <curl/curl.h>
+#ifndef CURL_WRITEFUNC_ERROR
+#define CURL_WRITEFUNC_ERROR 0
+#endif
+
static size_t
write_callback(char *buffer, size_t size, size_t nitems, void *userp)
{
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -3075,6 +3075,10 @@ doFile(Mapi mid, stream *fp, bool useins
#ifdef HAVE_CURL
#include <curl/curl.h>
+#ifndef CURL_WRITEFUNC_ERROR
+#define CURL_WRITEFUNC_ERROR 0
+#endif
+
static size_t
write_callback(char *buffer, size_t size, size_t nitems, void *userp)
{
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
@@ -1507,7 +1507,12 @@ sql_get_next_token(YYSTYPE *yylval, void
if (GDKstrFromStr((unsigned char *) str,
(unsigned char *)
yylval->sval + 2,
lc->yycur-lc->yysval
- 2, '\'') < 0) {
- sql_error(c, 1, SQLSTATE(42000) "%s",
GDKerrbuf);
+ char *err = GDKerrbuf;
+ if (strncmp(err, GDKERROR, strlen(GDKERROR)) ==
0)
+ err += strlen(GDKERROR);
+ else if (*err == '!')
+ err++;
+ sql_error(c, 1, SQLSTATE(42000) "%s", err);
return LEX_ERROR;
}
quote = '\'';
diff --git a/sql/test/BugTracker-2023/Tests/misc-crashes-7390.test
b/sql/test/BugTracker-2023/Tests/misc-crashes-7390.test
--- a/sql/test/BugTracker-2023/Tests/misc-crashes-7390.test
+++ b/sql/test/BugTracker-2023/Tests/misc-crashes-7390.test
@@ -241,7 +241,7 @@ DROP TABLE v0
statement ok
CREATE TABLE v0(v1 INT)
-statement error
+statement error 42000!CATALOG: no such function 'sys'.'='
UPDATE v0 SET v1 = (WITH v0 AS (SELECT 42039652.000000) SELECT STDDEV_POP (96)
OVER (ORDER BY v1) FROM v0, v0 LIMIT 37 OFFSET 62) = 8
statement ok
@@ -420,15 +420,15 @@ DROP TABLE v0
-- SELECT ALL ( SELECT - - - - - - - - - - 48 FROM ( SELECT NULL - - - - - - -
- 89 FROM ( VALUES ( - - - - - - - - - - 74 ) , ( - - - - - 128 ) , ( - - - - -
- 8 ) , ( - - - - 61 ) ) AS v1 ( v1 ) GROUP BY ( ) , GROUPING SETS ( GROUPING
SETS ( GROUPING SETS ( ( ) ) ) ) , ( ) ORDER BY - - - - - - - - - - 255 LIKE v1
/ CASE WHEN v1 IS NULL THEN - - 75 END DESC , v1 , v1 LIMIT 63 ) AS v1 UNION
SELECT - - - - - - - - - - - - - 74 WHERE - v1 < - 89088397.000000 ) FROM (
SELECT * FROM ( VALUES ( - - - - - - - 61 ) , ( - - - 42 ) ) AS v1 ( v1 ) ) AS
v1 ( v1 )
-- sql/server/rel_select.c:4614: rel_groupings: Assertion `next_set' failed.
--- -- 30.sql
--- statement ok
--- CREATE TABLE v0(v2 DOUBLE PRIMARY KEY, v1 VARCHAR(1))
+-- 30.sql
+statement ok
+CREATE TABLE v0(v2 DOUBLE PRIMARY KEY, v1 VARCHAR(1))
--- statement ok
--- DELETE FROM v0 WHERE (SELECT v2 FROM v0 WHERE v0.v2 = v0.v1 GROUP BY
2.100000, v1) IN (10.100000, 10, 10 )
+statement ok
+DELETE FROM v0 WHERE (SELECT v2 FROM v0 WHERE v0.v2 = v0.v1 GROUP BY 2.100000,
v1) IN (10.100000, 10, 10 )
--- statement ok
--- DROP TABLE v0
+statement ok
+DROP TABLE v0
-- 31.sql
statement error 22003!overflow ...
diff --git a/sql/test/BugTracker-2024/Tests/All
b/sql/test/BugTracker-2024/Tests/All
--- a/sql/test/BugTracker-2024/Tests/All
+++ b/sql/test/BugTracker-2024/Tests/All
@@ -28,3 +28,5 @@ sign-issue-7458
contains-between-issue-7459
push_select_exp-issue-7460
unicode-escape-7461
+exp-bin-Bug-7462
+contains-cast-7463
diff --git a/sql/test/BugTracker-2024/Tests/between-boolean-7451.test
b/sql/test/BugTracker-2024/Tests/between-boolean-7451.test
--- a/sql/test/BugTracker-2024/Tests/between-boolean-7451.test
+++ b/sql/test/BugTracker-2024/Tests/between-boolean-7451.test
@@ -1,4 +1,3 @@
-
statement ok
CREATE TABLE t0(c0 VARCHAR, PRIMARY KEY(c0))
@@ -29,7 +28,7 @@ True
True
query IT
-SELECT t1.c1, t1.c2 FROM t1, t0 WHERE (NOT CAST((true BETWEEN t1.c2 AND t0.c0)
AS VARCHAR));
+SELECT t1.c1, t1.c2 FROM t1, t0 WHERE (NOT CAST((true BETWEEN t1.c2 AND t0.c0)
AS VARCHAR))
----
0
NULL
@@ -37,7 +36,7 @@ 0
NULL
query ITT
-SELECT * FROM t1, t0 WHERE (NOT CAST((true BETWEEN t1.c2 AND t0.c0) AS
VARCHAR)); -- 2 rows
+SELECT * FROM t1, t0 WHERE (NOT CAST((true BETWEEN t1.c2 AND t0.c0) AS
VARCHAR))
----
0
NULL
@@ -45,3 +44,10 @@ a
0
NULL
false
+
+statement ok
+DROP TABLE t1
+
+statement ok
+DROP TABLE t0
+
diff --git a/sql/test/BugTracker-2024/Tests/concat_order-7455.test
b/sql/test/BugTracker-2024/Tests/concat_order-7455.test
--- a/sql/test/BugTracker-2024/Tests/concat_order-7455.test
+++ b/sql/test/BugTracker-2024/Tests/concat_order-7455.test
@@ -58,7 +58,7 @@ False
False
query TTT
-SELECT * FROM v0, t0 WHERE (t0.c0||true BETWEEN v0.c0 AND v0.c0);
+SELECT * FROM v0, t0 WHERE (t0.c0||true BETWEEN v0.c0 AND v0.c0)
----
True
(empty)
@@ -69,3 +69,10 @@ 0
True
(empty)
0
+
+statement ok
+DROP VIEW v0
+
+statement ok
+DROP TABLE t0
+
diff --git a/sql/test/BugTracker-2024/Tests/constant-expression-issue-7457.test
b/sql/test/BugTracker-2024/Tests/constant-expression-issue-7457.test
--- a/sql/test/BugTracker-2024/Tests/constant-expression-issue-7457.test
+++ b/sql/test/BugTracker-2024/Tests/constant-expression-issue-7457.test
@@ -28,3 +28,7 @@ a
False
b
NULL
+
+statement ok
+DROP TABLE t0
+
diff --git a/sql/test/BugTracker-2024/Tests/contains-between-issue-7459.test
b/sql/test/BugTracker-2024/Tests/contains-between-issue-7459.test
--- a/sql/test/BugTracker-2024/Tests/contains-between-issue-7459.test
+++ b/sql/test/BugTracker-2024/Tests/contains-between-issue-7459.test
@@ -4,3 +4,7 @@ CREATE TABLE t0(c0 INTEGER, c1 VARCHAR(5
query IT
SELECT * FROM t0 ORDER BY CONTAINS(((CASE '1' WHEN t0.c0 THEN '' ELSE t0.c0
END ) NOT BETWEEN 0 AND t0.c0>=t0.c1), t0.c1) DESC
----
+
+statement ok
+DROP TABLE t0
+
diff --git a/sql/test/BugTracker-2024/Tests/contains-cast-7463.test
b/sql/test/BugTracker-2024/Tests/contains-cast-7463.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2024/Tests/contains-cast-7463.test
@@ -0,0 +1,45 @@
+statement ok
+CREATE TABLE t0(c0 INT, c1 INT)
+
+statement ok
+INSERT INTO t0 (c0) VALUES (0)
+
+statement ok
+INSERT INTO t0 (c0, c1) VALUES (1, 1)
+
+query II
+SELECT * FROM t0
+----
+0
+NULL
+1
+1
+
+query IIT
+SELECT t0.c0, CONTAINS(0, t0.c0), CAST(CONTAINS(0, t0.c0) AS VARCHAR) FROM t0
+----
+0
+1
+true
+1
+0
+false
+
+query I
+SELECT (t0.c1)AND(CAST(CONTAINS(0, t0.c0) AS VARCHAR)) FROM t0
+----
+NULL
+0
+
+query II
+SELECT * FROM t0 WHERE ((t0.c1)AND(CAST(CONTAINS(0, t0.c0) AS VARCHAR)))
+-----
+
+query II
+SELECT * FROM t0 WHERE (NOT ((t0.c1)AND(CAST(CONTAINS(0, t0.c0) AS VARCHAR))))
+----
+1
+1
+
+statement ok
+DROP TABLE t0
diff --git a/sql/test/BugTracker-2024/Tests/exp-bin-Bug-7462.test
b/sql/test/BugTracker-2024/Tests/exp-bin-Bug-7462.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2024/Tests/exp-bin-Bug-7462.test
@@ -0,0 +1,23 @@
+statement ok
+CREATE TABLE t0(c0 VARCHAR(500), c1 VARCHAR(500))
+
+statement ok
+INSERT INTO t0(c1) VALUES ('a')
+
+query TTI
+SELECT t0.c1, t0.c0, (((t0.c1 BETWEEN -1 AND 1))OR((t0.c1 BETWEEN -1 AND ('b'
IN (t0.c1, t0.c0))))) FROM t0
+----
+a
+NULL
+NULL
+
+
+-- next query fails in: sql/backends/monet5/rel_bin.c:1680: exp_bin: Assertion
`s' failed.
+-- with assertion disabled it fails to return a result set
+query TT
+SELECT t0.c1, t0.c0 FROM t0 WHERE (((t0.c1 BETWEEN -1 AND 1))OR((t0.c1 BETWEEN
-1 AND ('b' IN (t0.c1, t0.c0)))))
+----
+
+
+statement ok
+DROP TABLE t0
diff --git a/sql/test/BugTracker-2024/Tests/function_return_issue.test
b/sql/test/BugTracker-2024/Tests/function_return_issue.test
--- a/sql/test/BugTracker-2024/Tests/function_return_issue.test
+++ b/sql/test/BugTracker-2024/Tests/function_return_issue.test
@@ -13,3 +13,6 @@ select id from do_test(true)
----
1
+statement ok
+drop function do_test
+
diff --git a/sql/test/BugTracker-2024/Tests/push_select_exp-issue-7460.test
b/sql/test/BugTracker-2024/Tests/push_select_exp-issue-7460.test
--- a/sql/test/BugTracker-2024/Tests/push_select_exp-issue-7460.test
+++ b/sql/test/BugTracker-2024/Tests/push_select_exp-issue-7460.test
@@ -12,3 +12,10 @@ SELECT * FROM t0, v0 WHERE CAST((t0.c2 B
----
True
1
+
+statement ok
+DROP VIEW v0
+
+statement ok
+DROP TABLE t0
+
diff --git a/sql/test/BugTracker-2024/Tests/where_null-7450.test
b/sql/test/BugTracker-2024/Tests/where_null-7450.test
--- a/sql/test/BugTracker-2024/Tests/where_null-7450.test
+++ b/sql/test/BugTracker-2024/Tests/where_null-7450.test
@@ -1,20 +1,28 @@
statement ok
-CREATE TABLE t0(c0 INT);
+CREATE TABLE t0(c0 INT)
statement ok
-INSERT INTO t0 ( c0) VALUES (false);
+INSERT INTO t0 ( c0) VALUES (false)
statement ok
-CREATE VIEW v0(c0) AS SELECT true FROM t0 WHERE NULL GROUP BY t0.c0, true;
+CREATE VIEW v0(c0) AS SELECT true FROM t0 WHERE NULL GROUP BY t0.c0, true
query I
-SELECT * FROM v0;
+SELECT * FROM v0
----
query I
-SELECT * FROM v0 WHERE true;
+SELECT * FROM v0 WHERE true
----
query I
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
