Changeset: 8a6ff73009f1 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8a6ff73009f1 Modified Files: sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-nullif-coalesce.Bug-6565.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-nullif-coalesce.Bug-6565.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.stable.out Branch: Jun2020 Log Message:
No hugeint in the output diffs (71 lines): diff --git a/sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-nullif-coalesce.Bug-6565.sql b/sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-nullif-coalesce.Bug-6565.sql --- a/sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-nullif-coalesce.Bug-6565.sql +++ b/sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-nullif-coalesce.Bug-6565.sql @@ -1,3 +1,3 @@ -SELECT + NULLIF ( + 67, + + NULLIF ( + + 46, 66 - CASE WHEN 51 IN ( + 91 ) THEN + SUM ( CAST ( NULL AS INTEGER ) ) +SELECT CAST(+ NULLIF ( + 67, + + NULLIF ( + + 46, 66 - CASE WHEN 51 IN ( + 91 ) THEN + SUM ( CAST ( NULL AS INTEGER ) ) + - 92 ELSE - ( - 47 ) END ) ) / - CAST ( NULL AS INTEGER ) + + NULLIF ( - COALESCE ( CAST ( - 35 AS INTEGER ), + 6, -CAST ( COUNT ( ALL 28 ) AS INT) ), 75 + 14 ); +CAST ( COUNT ( ALL 28 ) AS INT) ), 75 + 14 ) AS BIGINT); diff --git a/sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-nullif-coalesce.Bug-6565.stable.out b/sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-nullif-coalesce.Bug-6565.stable.out --- a/sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-nullif-coalesce.Bug-6565.stable.out +++ b/sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-nullif-coalesce.Bug-6565.stable.out @@ -25,10 +25,10 @@ stdout of test 'sqlitelogictest-complex- #SELECT + NULLIF ( + 67, + + NULLIF ( + + 46, 66 - CASE WHEN 51 IN ( + 91 ) THEN + SUM ( CAST ( NULL AS INTEGER ) ) #+ - 92 ELSE - ( - 47 ) END ) ) / - CAST ( NULL AS INTEGER ) + + NULLIF ( - COALESCE ( CAST ( - 35 AS INTEGER ), + 6, -#CAST ( COUNT ( ALL 28 ) AS INT) ), 75 + 14 ); -% .%15 # table_name -% %15 # name -% hugeint # type +#CAST ( COUNT ( ALL 28 ) AS INT) ), 75 + 14 ) AS BIGINT); +% .%11 # table_name +% %11 # name +% bigint # type % 1 # length [ NULL ] diff --git a/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.sql b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.sql --- a/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.sql +++ b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.sql @@ -1,3 +1,3 @@ -SELECT ALL + 60 * - NULLIF ( - CAST ( NULL AS INTEGER ), 51 * 70 * 62 / + 52 * + 58 / 90 - CAST ( + 44 AS INTEGER ) ) AS col2, 35; +SELECT ALL CAST(+ 60 * - NULLIF ( - CAST ( NULL AS INTEGER ), 51 * 70 * 62 / + 52 * + 58 / 90 - CAST ( + 44 AS INTEGER ) ) AS BIGINT) AS col2, 35; SELECT ALL CAST( 11 * COUNT ( * ) * + 2 * 6 AS BIGINT); SELECT ALL - 9 * NULLIF ( + 30, + 64 ) * + 46 * 1; diff --git a/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.stable.out b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.stable.out --- a/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.stable.out +++ b/sql/test/BugTracker-2018/Tests/sqlitelogictest-select-errors.Bug-6600.stable.out @@ -5,28 +5,10 @@ stdout of test 'sqlitelogictest-select-e # 12:42:15 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38685" "--set" "mapi_usock=/var/tmp/mtest-28541/.s.monetdb.38685" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/niels/scratch/rc-old/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018" "--set" "embedded_c=true" # 12:42:15 > -# MonetDB 5 server v11.29.4 -# This is an unreleased version -# Serving database 'mTests_sql_test_BugTracker-2018', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers -# Found 15.386 GiB available main-memory. -# Copyright (c) 1993 - July 2008 CWI. -# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved -# Visit https://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://xps13:38685/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-28541/.s.monetdb.38685 -# MonetDB/GIS module loaded -# MonetDB/SQL module loaded - - -# 12:42:15 > -# 12:42:15 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-28541" "--port=38685" -# 12:42:15 > - -#SELECT ALL + 60 * - NULLIF ( - CAST ( NULL AS INTEGER ), 51 * 70 * 62 / + 52 * + 58 / 90 - CAST ( + 44 AS INTEGER ) ) AS col2, 35; -% ., .%4 # table_name -% col2, %4 # name -% hugeint, tinyint # type +#SELECT ALL CAST(+ 60 * - NULLIF ( - CAST ( NULL AS INTEGER ), 51 * 70 * 62 / + 52 * + 58 / 90 - CAST ( + 44 AS INTEGER ) ) AS BIGINT) AS col2, 35; +% ., .%5 # table_name +% col2, %5 # name +% bigint, tinyint # type % 1, 2 # length [ NULL, 35 ] #SELECT ALL CAST( 11 * COUNT ( * ) * + 2 * 6 AS BIGINT); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
