Changeset: c8a4ff012086 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c8a4ff012086
Branch: default
Log Message:
Merge with Aug2024 branch.
diffs (truncated from 441 to 300 lines):
diff --git a/monetdb5/modules/mal/Tests/toy_events
b/monetdb5/modules/mal/Tests/toy_events
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/toy_events
+++ /dev/null
@@ -1,208 +0,0 @@
-1,1
-2,4
-3,9
-4,16
-5,25
-6,36
-7,49
-8,64
-9,81
-10,100
-11,121
-12,144
-13,169
-1,1
-2,4
-3,9
-4,16
-5,25
-6,36
-7,49
-8,64
-9,81
-10,100
-11,121
-12,144
-13,169
-1,1
-2,4
-3,9
-4,16
-5,25
-6,36
-7,49
-8,64
-9,81
-10,100
-11,121
-12,144
-13,169
-1,1
-2,4
-3,9
-4,16
-5,25
-6,36
-7,49
-8,64
-9,81
-10,100
-11,121
-12,144
-13,169
-1,1
-2,4
-3,9
-4,16
-5,25
-6,36
-7,49
-8,64
-9,81
-10,100
-11,121
-12,144
-13,169
-1,1
-2,4
-3,9
-4,16
-5,25
-6,36
-7,49
-8,64
-9,81
-10,100
-11,121
-12,144
-13,169
-1,1
-2,4
-3,9
-4,16
-5,25
-6,36
-7,49
-8,64
-9,81
-10,100
-11,121
-12,144
-13,169
-1,1
-2,4
-3,9
-4,16
-5,25
-6,36
-7,49
-8,64
-9,81
-10,100
-11,121
-12,144
-13,169
-1,1
-2,4
-3,9
-4,16
-5,25
-6,36
-7,49
-8,64
-9,81
-10,100
-11,121
-12,144
-13,169
-1,1
-2,4
-3,9
-4,16
-5,25
-6,36
-7,49
-8,64
-9,81
-10,100
-11,121
-12,144
-13,169
-1,1
-2,4
-3,9
-4,16
-5,25
-6,36
-7,49
-8,64
-9,81
-10,100
-11,121
-12,144
-13,169
-1,1
-2,4
-3,9
-4,16
-5,25
-6,36
-7,49
-8,64
-9,81
-10,100
-11,121
-12,144
-13,169
-1,1
-2,4
-3,9
-4,16
-5,25
-6,36
-7,49
-8,64
-9,81
-10,100
-11,121
-12,144
-13,169
-1,1
-2,4
-3,9
-4,16
-5,25
-6,36
-7,49
-8,64
-9,81
-10,100
-11,121
-12,144
-13,169
-1,1
-2,4
-3,9
-4,16
-5,25
-6,36
-7,49
-8,64
-9,81
-10,100
-11,121
-12,144
-13,169
-1,1
-2,4
-3,9
-4,16
-5,25
-6,36
-7,49
-8,64
-9,81
-10,100
-11,121
-12,144
-13,169
diff --git a/monetdb5/tools/Tests/All b/monetdb5/tools/Tests/All
--- a/monetdb5/tools/Tests/All
+++ b/monetdb5/tools/Tests/All
@@ -1,2 +1,1 @@
-mclient-t-s
HAVE_IPV6?mserver5-ipv6
diff --git a/monetdb5/tools/Tests/mclient-t-s.MAL.py
b/monetdb5/tools/Tests/mclient-t-s.MAL.py
deleted file mode 100644
--- a/monetdb5/tools/Tests/mclient-t-s.MAL.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import os, sys
-try:
- from MonetDBtesting import process
-except ImportError:
- import process
-
-def client(args):
- clt = process.client('mal', args = args,
- stdout = process.PIPE, stderr = process.PIPE)
- out, err = clt.communicate()
- sys.stderr.write(err)
-
-client(['-s', 'io.print(123);'])
diff --git a/monetdb5/tools/Tests/mserver5-ipv6.py
b/monetdb5/tools/Tests/mserver5-ipv6.py
--- a/monetdb5/tools/Tests/mserver5-ipv6.py
+++ b/monetdb5/tools/Tests/mserver5-ipv6.py
@@ -5,7 +5,7 @@ except ImportError:
import process
with process.server(stdin=process.PIPE, stdout=process.PIPE,
- stderr=process.PIPE, ipv6=True) as server:
+ stderr=process.PIPE, ipv6=True, mapiport=0) as server:
with process.client('sql', host='::1', server=server,
stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE) as client:
diff --git a/sql/test/datetime/Tests/str_to_date.test
b/sql/test/datetime/Tests/str_to_date.test
--- a/sql/test/datetime/Tests/str_to_date.test
+++ b/sql/test/datetime/Tests/str_to_date.test
@@ -1,8 +1,8 @@
statement ok
-create table idt (n int, d varchar(10), p varchar(10));
+create table idt (n int, d varchar(10), p varchar(10))
statement ok
-insert into idt values
+insert into idt values
(1, '2019-01-11', '%Y-%m-%d'),
(2, '2020-01-11', '%Y-%d-%m'),
(3, '2021-01-11', '%F')
@@ -20,11 +20,11 @@ 2021-01-11
# the CASE clause assures that we use a bat version of str_to_date which
# accept oid as arguments for the case of CASE condition (see the MAL)
query IT rowsort
-select n,
- case when n < 2 then
+select n,
+ case when n < 2 then
str_to_date(d,'%Y-%m-%d')
- else
- str_to_date(d,'%Y-%m-%d')
+ else
+ str_to_date(d,'%Y-%m-%d')
end
from idt
----
@@ -35,7 +35,6 @@ 2020-01-11
3
2021-01-11
-
query IT rowsort
select n, str_to_date('1999-01-12', p) from idt
----
@@ -49,11 +48,11 @@ 1999-01-12
# the CASE clause assures that we use a bat version of str_to_date which
# accept oid as arguments for the case of CASE condition (see the MAL)
query IT rowsort
-select n,
- case when n < 2 then
+select n,
+ case when n < 2 then
str_to_date('1999-01-12', p)
- else
- str_to_date('1999-01-12', p)
+ else
+ str_to_date('1999-01-12', p)
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
