Changeset: 46793370b506 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=46793370b506
Modified Files:
sql/test/pg_regress/Tests/int8.sql
sql/test/pg_regress/Tests/int8.stable.err
sql/test/pg_regress/Tests/int8.stable.out
sql/test/pg_regress/Tests/int8.stable.out.int128
Branch: default
Log Message:
Making the output more stable as the query can result in different errors due
to execution order.
By excluding one value the error output should always be as defined in
stable.err
diffs (63 lines):
diff --git a/sql/test/pg_regress/Tests/int8.sql
b/sql/test/pg_regress/Tests/int8.sql
--- a/sql/test/pg_regress/Tests/int8.sql
+++ b/sql/test/pg_regress/Tests/int8.sql
@@ -25,7 +25,7 @@ SELECT '' AS five, q1 AS plus, -q1 AS mi
SELECT '' AS five, q1, q2, q1 + q2 AS plus FROM INT8_TBL;
SELECT '' AS five, q1, q2, q1 - q2 AS minus FROM INT8_TBL;
-SELECT '' AS three, q1, q2, q1 * q2 AS multiply FROM INT8_TBL ORDER BY q1, q2;
+SELECT '' AS three, q1, q2, q1 * q2 AS multiply FROM INT8_TBL WHERE q2 <>
4567890123456789 ORDER BY q1, q2;
SELECT '' AS three, q1, q2, q1 * q2 AS multiply FROM INT8_TBL
WHERE q1 < 1000 or (q2 > 0 and q2 < 1000);
SELECT '' AS five, q1, q2, q1 / q2 AS divide FROM INT8_TBL;
diff --git a/sql/test/pg_regress/Tests/int8.stable.err
b/sql/test/pg_regress/Tests/int8.stable.err
--- a/sql/test/pg_regress/Tests/int8.stable.err
+++ b/sql/test/pg_regress/Tests/int8.stable.err
@@ -51,7 +51,7 @@ MAPI = (monetdb) /var/tmp/mtest-19737/.
QUERY = INSERT INTO INT8_TBL(q1) VALUES ('');
ERROR = !conversion of string '' to type lng failed.
MAPI = (monetdb) /var/tmp/mtest-19737/.s.monetdb.30205
-QUERY = SELECT '' AS three, q1, q2, q1 * q2 AS multiply FROM INT8_TBL ORDER BY
q1, q2;
+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.
MAPI = (monetdb) /var/tmp/mtest-19737/.s.monetdb.30205
QUERY = SELECT '' AS to_char_1, to_char(q1, '9G999G999G999G999G999'),
to_char(q2, '9,999,999,999,999,999')
diff --git a/sql/test/pg_regress/Tests/int8.stable.out
b/sql/test/pg_regress/Tests/int8.stable.out
--- a/sql/test/pg_regress/Tests/int8.stable.out
+++ b/sql/test/pg_regress/Tests/int8.stable.out
@@ -90,13 +90,12 @@ Ready.
[ "", 4567890123456789, 123, 4567890123456666 ]
[ "", 4567890123456789, 4567890123456789, 0 ]
[ "", 4567890123456789, -4567890123456789, 9135780246913578 ]
-#SELECT '' AS three, q1, q2, q1 * q2 AS multiply FROM INT8_TBL ORDER BY q1, q2;
+#SELECT '' AS three, q1, q2, q1 * q2 AS multiply FROM INT8_TBL WHERE q2 <>
4567890123456789 ORDER BY q1, q2;
% .L, sys.int8_tbl, sys.int8_tbl, sys.L # table_name
% three, q1, q2, multiply # name
% char, bigint, bigint, bigint # type
% 0, 16, 16, 18 # length
[ "", 123, 456, 56088 ]
-[ "", 123, 4567890123456789, 561850485185185047 ]
[ "", 4567890123456789, 123, 561850485185185047 ]
#SELECT '' AS five, q1, q2, q1 / q2 AS divide FROM INT8_TBL;
% .L, sys.int8_tbl, sys.int8_tbl, sys.L # table_name
diff --git a/sql/test/pg_regress/Tests/int8.stable.out.int128
b/sql/test/pg_regress/Tests/int8.stable.out.int128
--- a/sql/test/pg_regress/Tests/int8.stable.out.int128
+++ b/sql/test/pg_regress/Tests/int8.stable.out.int128
@@ -90,16 +90,14 @@ Ready.
[ "", 4567890123456789, 123, 4567890123456666 ]
[ "", 4567890123456789, 4567890123456789, 0 ]
[ "", 4567890123456789, -4567890123456789, 9135780246913578 ]
-#SELECT '' AS three, q1, q2, q1 * q2 AS multiply FROM INT8_TBL ORDER BY q1, q2;
+#SELECT '' AS three, q1, q2, q1 * q2 AS multiply FROM INT8_TBL WHERE q2 <>
4567890123456789 ORDER BY q1, q2;
% .L, sys.int8_tbl, sys.int8_tbl, sys.L # table_name
% three, q1, q2, multiply # name
% char, bigint, bigint, hugeint # type
% 0, 16, 17, 33 # length
[ "", 123, 456, 56088 ]
-[ "", 123, 4567890123456789, 561850485185185047 ]
[ "", 4567890123456789, -4567890123456789,
-20865620179974079051998750190521 ]
[ "", 4567890123456789, 123, 561850485185185047 ]
-[ "", 4567890123456789, 4567890123456789,
20865620179974079051998750190521 ]
#SELECT '' AS three, q1, q2, q1 * q2 AS multiply FROM INT8_TBL
# WHERE q1 < 1000 or (q2 > 0 and q2 < 1000);
% .L, sys.int8_tbl, sys.int8_tbl, sys.L # table_name
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
