Changeset: 0080f4d3905d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/0080f4d3905d Modified Files: sql/test/miscellaneous/Tests/deallocate.stable.err sql/test/miscellaneous/Tests/groupby_prepare.stable.err sql/test/miscellaneous/Tests/select_groupby.stable.err sql/test/prepare/Tests/prepare-types.Bug-6724.stable.err sql/test/prepare/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.err sql/test/prepare/Tests/prepare_decimal_bug.SF-2831994.stable.err sql/test/prepare/Tests/prepared-merge-statement.Bug-6706.stable.err sql/test/prepare/Tests/sample.15.stable.err sql/test/prepare/Tests/sqlancer_prepare.stable.err sql/test/prepare/Tests/sqlancer_prepare.stable.err.int128 sql/test/prepare/Tests/subquery_prepare.stable.err testing/sqltest.py Branch: Aug2024 Log Message:
Normalize test output: convert port number to 50000. This happens in the --approve output. diffs (truncated from 328 to 300 lines): diff --git a/sql/test/miscellaneous/Tests/deallocate.stable.err b/sql/test/miscellaneous/Tests/deallocate.stable.err --- a/sql/test/miscellaneous/Tests/deallocate.stable.err +++ b/sql/test/miscellaneous/Tests/deallocate.stable.err @@ -1,16 +1,16 @@ -MAPI = monetdb@localhost:35929 +MAPI = monetdb@localhost:50000 QUERY = exec 0(false); --error, the last prepared statement, no longer exists; ERROR = !EXEC: PREPARED Statement missing '0' CODE = 42000 -MAPI = monetdb@localhost:35929 +MAPI = monetdb@localhost:50000 QUERY = DEALLOCATE 0; --error, last prepared statement already closed ERROR = !No prepared statement with id: 0 CODE = 07003 -MAPI = monetdb@localhost:35929 +MAPI = monetdb@localhost:50000 QUERY = EXECUTE 1(false); --error, the last prepared statement, no longer exists; ERROR = !EXEC: PREPARED Statement missing '1' CODE = 42000 -MAPI = monetdb@localhost:35929 +MAPI = monetdb@localhost:50000 QUERY = DEALLOCATE 100000; --error, it doesn't exist ERROR = !No prepared statement with id: 100000 CODE = 07003 diff --git a/sql/test/miscellaneous/Tests/groupby_prepare.stable.err b/sql/test/miscellaneous/Tests/groupby_prepare.stable.err --- a/sql/test/miscellaneous/Tests/groupby_prepare.stable.err +++ b/sql/test/miscellaneous/Tests/groupby_prepare.stable.err @@ -1,28 +1,28 @@ -MAPI = monetdb@localhost:35929 +MAPI = monetdb@localhost:50000 QUERY = prepare select col0 from tab0 where (?) in (?); --error ERROR = !For the IN operator, both sides must have a type defined CODE = 42000 -MAPI = monetdb@localhost:35929 +MAPI = monetdb@localhost:50000 QUERY = prepare select ? = ALL (select ? from tab0) from tab0 t1; --error ERROR = !Cannot have a parameter (?) on both sides of an expression CODE = 42000 -MAPI = monetdb@localhost:35929 +MAPI = monetdb@localhost:50000 QUERY = prepare select 1 from tab0 where ? between ? and ?; --error ERROR = !Cannot have a parameter (?) on both sides of an expression CODE = 42000 -MAPI = monetdb@localhost:35929 +MAPI = monetdb@localhost:50000 QUERY = prepare select case when col0 = 0 then ? else ? end from tab0; --error ERROR = !Result type missing CODE = 42000 -MAPI = monetdb@localhost:35929 +MAPI = monetdb@localhost:50000 QUERY = prepare select case when col0 = 0 then ? when col0 = 1 then ? else ? end from tab0; --error ERROR = !Result type missing CODE = 42000 -MAPI = monetdb@localhost:35929 +MAPI = monetdb@localhost:50000 QUERY = prepare select max(?); --error ERROR = !MAX: parameters not allowed as arguments to aggregate functions CODE = 42000 -MAPI = monetdb@localhost:35929 +MAPI = monetdb@localhost:50000 QUERY = prepare select max(?) over (); --error ERROR = !MAX: parameters not allowed as arguments to window functions CODE = 42000 diff --git a/sql/test/miscellaneous/Tests/select_groupby.stable.err b/sql/test/miscellaneous/Tests/select_groupby.stable.err --- a/sql/test/miscellaneous/Tests/select_groupby.stable.err +++ b/sql/test/miscellaneous/Tests/select_groupby.stable.err @@ -1,16 +1,16 @@ -MAPI = monetdb@localhost:35929 +MAPI = monetdb@localhost:50000 QUERY = create function "sys"."dummy"("col1" blob, "col2" blob, "col3" integer) returns boolean external name "unknown"."idontexist"; --error, MAL implementation of sys.dummy doesn't exist. ERROR = !CREATE FUNCTION: external name unknown.idontexist not bound (sys.dummy) CODE = 3F000 -MAPI = monetdb@localhost:35929 +MAPI = monetdb@localhost:50000 QUERY = SELECT "sys"."dummy"("fortieth-second", blob '', '0') AS "alias1", "fortieth-third" FROM "myschema"."mytable"; --error, function doesn't exist ERROR = !SELECT: no such operator 'sys'.'dummy'(blob, blob, varchar(1)) CODE = 42000 -MAPI = monetdb@localhost:35929 +MAPI = monetdb@localhost:50000 QUERY = exec 7 (blob 'aaaa'); --error, cannot cast ERROR = !types blob(0,0) and sec_interval(13,0) are not equal CODE = 42000 -MAPI = monetdb@localhost:35929 +MAPI = monetdb@localhost:50000 QUERY = exec 8 (time '10:00:00' + 1); --error, no such binary operator ERROR = !SELECT: no such binary operator 'sys'.'sql_add'(time,tinyint) CODE = 42000 diff --git a/sql/test/prepare/Tests/prepare-types.Bug-6724.stable.err b/sql/test/prepare/Tests/prepare-types.Bug-6724.stable.err --- a/sql/test/prepare/Tests/prepare-types.Bug-6724.stable.err +++ b/sql/test/prepare/Tests/prepare-types.Bug-6724.stable.err @@ -1,4 +1,4 @@ -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = exec 2(); --error ERROR = !EXEC called with wrong number of arguments: expected 1, got 0 CODE = 42000 diff --git a/sql/test/prepare/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.err b/sql/test/prepare/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.err --- a/sql/test/prepare/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.err +++ b/sql/test/prepare/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.err @@ -1,8 +1,8 @@ -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = prepare select * from env() as env where ? = ?; ERROR = !Cannot have a parameter (?) on both sides of an expression CODE = 42000 -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = prepare select ? from env() as env; ERROR = !Could not determine type for argument number 1 CODE = 42000 diff --git a/sql/test/prepare/Tests/prepare_decimal_bug.SF-2831994.stable.err b/sql/test/prepare/Tests/prepare_decimal_bug.SF-2831994.stable.err --- a/sql/test/prepare/Tests/prepare_decimal_bug.SF-2831994.stable.err +++ b/sql/test/prepare/Tests/prepare_decimal_bug.SF-2831994.stable.err @@ -1,4 +1,4 @@ -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = exec 0 (3,0.0,2.34); ERROR = !overflow in conversion to DECIMAL(5,5). CODE = 22003 diff --git a/sql/test/prepare/Tests/prepared-merge-statement.Bug-6706.stable.err b/sql/test/prepare/Tests/prepared-merge-statement.Bug-6706.stable.err --- a/sql/test/prepare/Tests/prepared-merge-statement.Bug-6706.stable.err +++ b/sql/test/prepare/Tests/prepared-merge-statement.Bug-6706.stable.err @@ -1,14 +1,14 @@ -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = prepare select * from test.share_daily_history inner join (values('BHP',?,?,?,?,?,?)) as source(id,timeid,c1,c2,c3,c4,volume) on source.id=share_daily_history.id and source.timeid=share_daily_history.timeid; --error ERROR = !Could not determine type for argument number 2 CODE = 42000 -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = exec 3(); --error ERROR = !EXEC called with wrong number of arguments: expected 1, got 0 CODE = 42000 -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = exec 4(1); --error ERROR = !EXEC called with wrong number of arguments: expected 0, got 1 CODE = 42000 diff --git a/sql/test/prepare/Tests/sample.15.stable.err b/sql/test/prepare/Tests/sample.15.stable.err --- a/sql/test/prepare/Tests/sample.15.stable.err +++ b/sql/test/prepare/Tests/sample.15.stable.err @@ -1,7 +1,7 @@ -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = select * from GENERATE_SERIES(1,41) sample 1.25; --should give error ERROR = !Illegal argument p should be between 0 and 1.0 -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = select * from GENERATE_SERIES(1,41) seed 1; --error, seed without sample ERROR = !SEED: cannot have SEED without SAMPLE CODE = 42000 diff --git a/sql/test/prepare/Tests/sqlancer_prepare.stable.err b/sql/test/prepare/Tests/sqlancer_prepare.stable.err --- a/sql/test/prepare/Tests/sqlancer_prepare.stable.err +++ b/sql/test/prepare/Tests/sqlancer_prepare.stable.err @@ -1,58 +1,58 @@ -MAPI = monetdb@localhost:38939 +MAPI = monetdb@localhost:50000 QUERY = PREPARE SELECT DISTINCT (SELECT DISTINCT r'|m<v' FROM t1 WHERE ((t1.c0)<(?)) GROUP BY t1.c2, ?), ?, t1.c2 FROM t1 WHERE CAST(? AS BOOLEAN) LIMIT 2103332269785059850; ERROR = !Cannot have a parameter (?) for group by column CODE = 42000 -MAPI = monetdb@localhost:38939 +MAPI = monetdb@localhost:50000 QUERY = PREPARE SELECT (SELECT ? FROM (select 1) as v1(c0)); ERROR = !Could not determine type for argument number 1 CODE = 42000 -MAPI = monetdb@localhost:38939 +MAPI = monetdb@localhost:50000 QUERY = PREPARE SELECT ?, CASE 'weHtU' WHEN (values (?)) THEN 'G' END; ERROR = !Could not determine type for argument number 1 CODE = 42000 -MAPI = monetdb@localhost:38939 +MAPI = monetdb@localhost:50000 QUERY = PREPARE SELECT DISTINCT ?, CAST(CASE least(?, r'weHtU') WHEN ? THEN ? WHEN ? THEN ? WHEN (VALUES (?)) THEN r'G' ELSE ? END AS DATE) WHERE (?) IS NOT NULL LIMIT 519007555986016405; ERROR = !Cannot have a parameter (?) for IS NOT NULL operator CODE = 42000 -MAPI = monetdb@localhost:38939 +MAPI = monetdb@localhost:50000 QUERY = PREPARE VALUES (CAST(? >> 1.2 AS INTERVAL SECOND)), (interval '1' second); -- error, cast integer to interval ERROR = !types bigint(63,0) and sec_interval(13,0) are not equal CODE = 42000 -MAPI = monetdb@localhost:38939 +MAPI = monetdb@localhost:50000 QUERY = prepare with cte0(c0) as (select 1), cte1(c0,c1,c2) as (select distinct 1, 2, false) select distinct least('y', (values (''), (''))), 1, (select ? from (select 1) as l1v0(x)) from cte0 as l0cte0, cte1 as l0cte1 order by l0cte0.c0 desc nulls last, l0cte1.c2 desc nulls first; -- ? can't be defined, so error ERROR = !SELECT: with DISTINCT ORDER BY expressions must appear in select list CODE = 42000 -MAPI = monetdb@localhost:38939 +MAPI = monetdb@localhost:50000 QUERY = prepare with cte0(c0) as (select 2) select 1 <> all(select 2 from (values (1),(2)) as t1) from cte0 as l0cte0 group by ?; --error, cannot have a parameter for group by column ERROR = !Cannot have a parameter (?) for group by column CODE = 42000 -MAPI = monetdb@localhost:38939 +MAPI = monetdb@localhost:50000 QUERY = prepare with cte0(c0) as (select 2) select 1 <> all(select 2 from (values (1),(2)) as t1) from cte0 as l0cte0 order by ?; --error, cannot have a parameter for order by column ERROR = !Cannot have a parameter (?) for order by column CODE = 42000 -MAPI = monetdb@localhost:38939 +MAPI = monetdb@localhost:50000 QUERY = PREPARE SELECT 1 FROM idontexist(?,16); --error, function doesn't exist ERROR = !SELECT: no such table returning function 'idontexist'(?, tinyint) CODE = 42000 -MAPI = monetdb@localhost:38939 +MAPI = monetdb@localhost:50000 QUERY = PREPARE WITH x(a) AS (SELECT ?) SELECT x.a FROM x; --error, cannot define type for the parameter ERROR = !Could not determine type for argument number 1 CODE = 42000 -MAPI = monetdb@localhost:38939 +MAPI = monetdb@localhost:50000 QUERY = PREPARE WITH x(x) AS (SELECT ?) SELECT 1 FROM x WHERE COALESCE(FALSE, TRUE) OR (SELECT TRUE FROM t0); --error ERROR = !Could not determine type for argument number 1 CODE = 42000 -MAPI = monetdb@localhost:38939 +MAPI = monetdb@localhost:50000 QUERY = PREPARE SELECT 1 FROM (SELECT 1) x(x) LEFT OUTER JOIN (SELECT DISTINCT ?) y(y) ON (SELECT TRUE FROM (SELECT 1) z(z)); --error while unnesting because of unknown type ERROR = !Cannot rewrite subquery because of parameter with unknown type CODE = 42000 -MAPI = monetdb@localhost:38939 +MAPI = monetdb@localhost:50000 QUERY = PREPARE SELECT 1 FROM (SELECT ?) x(x) CROSS JOIN LATERAL (SELECT 1 FROM ((SELECT 1) INTERSECT (SELECT 2)) vx(vx) JOIN (SELECT 1) z(z) ON x.x) w(w); --error, Could not determine type for argument number 1 ERROR = !Could not determine type for argument number 1 CODE = 42000 -MAPI = monetdb@localhost:38939 +MAPI = monetdb@localhost:50000 QUERY = PREPARE SELECT 2 FROM (SELECT DISTINCT 1) z(z) LEFT OUTER JOIN LATERAL (SELECT z.z, ? WHERE TRUE) a(a,b) ON TRUE; --error, push_up_project requires a type ERROR = !Query projection must have at least one parameter with known SQL type CODE = 42000 diff --git a/sql/test/prepare/Tests/sqlancer_prepare.stable.err.int128 b/sql/test/prepare/Tests/sqlancer_prepare.stable.err.int128 --- a/sql/test/prepare/Tests/sqlancer_prepare.stable.err.int128 +++ b/sql/test/prepare/Tests/sqlancer_prepare.stable.err.int128 @@ -1,58 +1,58 @@ -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = PREPARE SELECT DISTINCT (SELECT DISTINCT r'|m<v' FROM t1 WHERE ((t1.c0)<(?)) GROUP BY t1.c2, ?), ?, t1.c2 FROM t1 WHERE CAST(? AS BOOLEAN) LIMIT 2103332269785059850; ERROR = !Cannot have a parameter (?) for group by column CODE = 42000 -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = PREPARE SELECT (SELECT ? FROM (select 1) as v1(c0)); ERROR = !Could not determine type for argument number 1 CODE = 42000 -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = PREPARE SELECT ?, CASE 'weHtU' WHEN (values (?)) THEN 'G' END; ERROR = !Could not determine type for argument number 1 CODE = 42000 -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = PREPARE SELECT DISTINCT ?, CAST(CASE least(?, r'weHtU') WHEN ? THEN ? WHEN ? THEN ? WHEN (VALUES (?)) THEN r'G' ELSE ? END AS DATE) WHERE (?) IS NOT NULL LIMIT 519007555986016405; ERROR = !Cannot have a parameter (?) for IS NOT NULL operator CODE = 42000 -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = PREPARE VALUES (CAST(? >> 1.2 AS INTERVAL SECOND)), (interval '1' second); -- error, cast integer to interval ERROR = !types hugeint(127,0) and sec_interval(13,0) are not equal CODE = 42000 -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = prepare with cte0(c0) as (select 1), cte1(c0,c1,c2) as (select distinct 1, 2, false) select distinct least('y', (values (''), (''))), 1, (select ? from (select 1) as l1v0(x)) from cte0 as l0cte0, cte1 as l0cte1 order by l0cte0.c0 desc nulls last, l0cte1.c2 desc nulls first; -- ? can't be defined, so error ERROR = !SELECT: with DISTINCT ORDER BY expressions must appear in select list CODE = 42000 -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = prepare with cte0(c0) as (select 2) select 1 <> all(select 2 from (values (1),(2)) as t1) from cte0 as l0cte0 group by ?; --error, cannot have a parameter for group by column ERROR = !Cannot have a parameter (?) for group by column CODE = 42000 -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = prepare with cte0(c0) as (select 2) select 1 <> all(select 2 from (values (1),(2)) as t1) from cte0 as l0cte0 order by ?; --error, cannot have a parameter for order by column ERROR = !Cannot have a parameter (?) for order by column CODE = 42000 -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = PREPARE SELECT 1 FROM idontexist(?,16); --error, function doesn't exist ERROR = !SELECT: no such table returning function 'idontexist'(?, tinyint) CODE = 42000 -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = PREPARE WITH x(a) AS (SELECT ?) SELECT x.a FROM x; --error, cannot define type for the parameter ERROR = !Could not determine type for argument number 1 CODE = 42000 -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = PREPARE WITH x(x) AS (SELECT ?) SELECT 1 FROM x WHERE COALESCE(FALSE, TRUE) OR (SELECT TRUE FROM t0); --error ERROR = !Could not determine type for argument number 1 CODE = 42000 -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = PREPARE SELECT 1 FROM (SELECT 1) x(x) LEFT OUTER JOIN (SELECT DISTINCT ?) y(y) ON (SELECT TRUE FROM (SELECT 1) z(z)); --error while unnesting because of unknown type ERROR = !Cannot rewrite subquery because of parameter with unknown type CODE = 42000 -MAPI = monetdb@localhost:37045 +MAPI = monetdb@localhost:50000 QUERY = PREPARE SELECT 1 FROM (SELECT ?) x(x) CROSS JOIN LATERAL (SELECT 1 FROM ((SELECT 1) INTERSECT (SELECT 2)) vx(vx) JOIN (SELECT 1) z(z) ON x.x) w(w); --error, Could not determine type for argument number 1 ERROR = !Could not determine type for argument number 1 CODE = 42000 _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org