Changeset: 3cb1c0ef99c8 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/3cb1c0ef99c8 Branch: default Log Message:
Merge with Aug2024 branch. diffs (truncated from 830 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/pg_regress/Tests/int8.SQL.py b/sql/test/pg_regress/Tests/int8.SQL.py deleted file mode 100644 --- a/sql/test/pg_regress/Tests/int8.SQL.py +++ /dev/null @@ -1,20 +0,0 @@ -from MonetDBtesting.sqltest import SQLTestCase -import pymonetdb, os - -conn1 = pymonetdb.connect(database=os.getenv("TSTDB"), port=int(os.getenv("MAPIPORT")), autocommit=True) -cur1 = conn1.cursor() -try: - cur1.execute('select cast(1 as hugeint)') - suffix = '.int128' -except pymonetdb.DatabaseError as e: - suffix = '' -cur1.close() -conn1.close() - -with SQLTestCase() as tc: - # optional or default connection - tc.connect() - with open('int8.sql') as f: - tc.execute(query=None, client='mclient', stdin=f)\ - .assertMatchStableOut(fout='int8.stable.out%s' % (suffix))\ - .assertMatchStableError(ferr='int8.stable.err%s' % (suffix)) diff --git a/sql/test/pg_regress/Tests/int8.stable.err b/sql/test/pg_regress/Tests/int8.stable.err deleted file mode 100644 --- a/sql/test/pg_regress/Tests/int8.stable.err +++ /dev/null @@ -1,104 +0,0 @@ -MAPI = (monetdb) /var/tmp/mtest-19737/.s.monetdb.30205 -QUERY = INSERT INTO INT8_TBL(q1) VALUES (' '); -ERROR = !conversion of string ' ' to type lng failed. -CODE = 22018 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = INSERT INTO INT8_TBL(q1) VALUES ('xxx'); -ERROR = !conversion of string 'xxx' to type lng failed. -CODE = 22018 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = INSERT INTO INT8_TBL(q1) VALUES ('3908203590239580293850293850329485'); -ERROR = !conversion of string '3908203590239580293850293850329485' to type lng failed. -CODE = 22018 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = INSERT INTO INT8_TBL(q1) VALUES ('-1204982019841029840928340329840934'); -ERROR = !conversion of string '-1204982019841029840928340329840934' to type lng failed. -CODE = 22018 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = INSERT INTO INT8_TBL(q1) VALUES ('- 123'); -ERROR = !conversion of string '- 123' to type lng failed. -CODE = 22018 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = INSERT INTO INT8_TBL(q1) VALUES (' 345 5'); -ERROR = !conversion of string ' 345 5' to type lng failed. -CODE = 22018 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = INSERT INTO INT8_TBL(q1) VALUES (''); -ERROR = !conversion of string '' to type lng failed. -CODE = 22018 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = SELECT '' AS three, q1, q2, q1 * q2 AS multiply FROM INT8_TBL WHERE q2 <> 4567890123456789 ORDER BY q1, q2; -ERROR = !overflow in calculation 4567890123456789*-4567890123456789. -CODE = 22003 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = SELECT '' AS to_char_1, to_char(q1, '9G999G999G999G999G999'), to_char(q2, '9,999,999,999,999,999') - FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = SELECT '' AS to_char_2, to_char(q1, '9G999G999G999G999G999D999G999'), to_char(q2, '9,999,999,999,999,999.999,999') - FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = SELECT '' AS to_char_3, to_char( (q1 * -1), '9999999999999999PR'), to_char( (q2 * -1), '9999999999999999.999PR') - FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = SELECT '' AS to_char_4, to_char( (q1 * -1), '9999999999999999S'), to_char( (q2 * -1), 'S9999999999999999') - FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = SELECT '' AS to_char_5, to_char(q2, 'MI9999999999999999') FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = SELECT '' AS to_char_6, to_char(q2, 'FMS9999999999999999') FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = SELECT '' AS to_char_7, to_char(q2, 'FM9999999999999999THPR') FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = SELECT '' AS to_char_8, to_char(q2, 'SG9999999999999999th') FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = SELECT '' AS to_char_9, to_char(q2, '0999999999999999') FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = SELECT '' AS to_char_10, to_char(q2, 'S0999999999999999') FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = SELECT '' AS to_char_11, to_char(q2, 'FM0999999999999999') FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = SELECT '' AS to_char_12, to_char(q2, 'FM9999999999999999.000') FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = SELECT '' AS to_char_13, to_char(q2, 'L9999999999999999.000') FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = SELECT '' AS to_char_14, to_char(q2, 'FM9999999999999999.999') FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = SELECT '' AS to_char_15, to_char(q2, 'S 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 . 9 9 9') FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = monetdb@WIN2K12R2:33746 -QUERY = SELECT '' AS to_char_16, to_char(q2, E'99999 "text" 9999 "9999" 999 "\\"text between quote marks\\"" 9999') FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = SELECT '' AS to_char_17, to_char(q2, '999999SG9999999999') FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 diff --git a/sql/test/pg_regress/Tests/int8.stable.err.int128 b/sql/test/pg_regress/Tests/int8.stable.err.int128 deleted file mode 100644 --- a/sql/test/pg_regress/Tests/int8.stable.err.int128 +++ /dev/null @@ -1,100 +0,0 @@ -MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395 -QUERY = INSERT INTO INT8_TBL(q1) VALUES (' '); -ERROR = !conversion of string ' ' to type lng failed. -CODE = 22018 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = INSERT INTO INT8_TBL(q1) VALUES ('xxx'); -ERROR = !conversion of string 'xxx' to type lng failed. -CODE = 22018 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = INSERT INTO INT8_TBL(q1) VALUES ('3908203590239580293850293850329485'); -ERROR = !conversion of string '3908203590239580293850293850329485' to type lng failed. -CODE = 22018 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = INSERT INTO INT8_TBL(q1) VALUES ('-1204982019841029840928340329840934'); -ERROR = !conversion of string '-1204982019841029840928340329840934' to type lng failed. -CODE = 22018 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = INSERT INTO INT8_TBL(q1) VALUES ('- 123'); -ERROR = !conversion of string '- 123' to type lng failed. -CODE = 22018 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = INSERT INTO INT8_TBL(q1) VALUES (' 345 5'); -ERROR = !conversion of string ' 345 5' to type lng failed. -CODE = 22018 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = INSERT INTO INT8_TBL(q1) VALUES (''); -ERROR = !conversion of string '' to type lng failed. -CODE = 22018 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = SELECT '' AS to_char_1, to_char(q1, '9G999G999G999G999G999'), to_char(q2, '9,999,999,999,999,999') - FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = SELECT '' AS to_char_2, to_char(q1, '9G999G999G999G999G999D999G999'), to_char(q2, '9,999,999,999,999,999.999,999') - FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = SELECT '' AS to_char_3, to_char( (q1 * -1), '9999999999999999PR'), to_char( (q2 * -1), '9999999999999999.999PR') - FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = SELECT '' AS to_char_4, to_char( (q1 * -1), '9999999999999999S'), to_char( (q2 * -1), 'S9999999999999999') - FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = SELECT '' AS to_char_5, to_char(q2, 'MI9999999999999999') FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = SELECT '' AS to_char_6, to_char(q2, 'FMS9999999999999999') FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = SELECT '' AS to_char_7, to_char(q2, 'FM9999999999999999THPR') FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = SELECT '' AS to_char_8, to_char(q2, 'SG9999999999999999th') FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = SELECT '' AS to_char_9, to_char(q2, '0999999999999999') FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = SELECT '' AS to_char_10, to_char(q2, 'S0999999999999999') FROM INT8_TBL; -ERROR = !SELECT: no such binary operator 'to_char'(bigint,char) -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = SELECT '' AS to_char_11, to_char(q2, 'FM0999999999999999') FROM INT8_TBL; _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org