Changeset: 9dc8e2433dc3 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9dc8e2433dc3 Modified Files: sql/test/pg_regress/Tests/float4.stable.err sql/test/pg_regress/Tests/float4.stable.out sql/test/pg_regress/Tests/float8.stable.err sql/test/pg_regress/Tests/float8.stable.err.Windows sql/test/pg_regress/Tests/float8.stable.out sql/test/pg_regress/Tests/float8.stable.out.Windows Branch: default Log Message:
With fix for bug 3696 the special values 'nan', 'Inf', 'Infinity', 'inf', 'infinity' are no longer accepted for floating point data types. Updated the float4 and float8 outputs. diffs (truncated from 473 to 300 lines): diff --git a/sql/test/pg_regress/Tests/float4.stable.err b/sql/test/pg_regress/Tests/float4.stable.err --- a/sql/test/pg_regress/Tests/float4.stable.err +++ b/sql/test/pg_regress/Tests/float4.stable.err @@ -29,55 +29,70 @@ stderr of test 'float4` in directory 'sq # 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1142" "--port=38959" # 17:11:19 > -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('10e40'); ERROR = !conversion of string '10e40' to type flt failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('-10e40'); ERROR = !conversion of string '-10e40' to type flt failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES (' '); ERROR = !conversion of string ' ' to type flt failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('xyz'); ERROR = !conversion of string 'xyz' to type flt failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('5.0.0'); ERROR = !conversion of string '5.0.0' to type flt failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('5 . 0'); ERROR = !conversion of string '5 . 0' to type flt failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('5. 0'); ERROR = !conversion of string '5. 0' to type flt failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES (' - 3.0'); ERROR = !conversion of string ' - 3.0' to type flt failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('123 5'); ERROR = !conversion of string '123 5' to type flt failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 +QUERY = SELECT cast('NaN' as real); +ERROR = !conversion of string 'NaN' to type flt failed. +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 +QUERY = SELECT cast('nan' as real); +ERROR = !conversion of string 'nan' to type flt failed. +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 +QUERY = SELECT cast(' NAN ' as real); +ERROR = !conversion of string ' NAN ' to type flt failed. +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT cast('infinity' as real); ERROR = !conversion of string 'infinity' to type flt failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 +QUERY = SELECT cast(' -INFINiTY ' as real); +ERROR = !conversion of string ' -INFINiTY ' to type flt failed. +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT cast('N A N' as real); ERROR = !conversion of string 'N A N' to type flt failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT cast('NaN x' as real); ERROR = !conversion of string 'NaN x' to type flt failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT cast(' INFINITY x' as real); ERROR = !conversion of string ' INFINITY x' to type flt failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT cast('Infinity' as real) + 100.0; ERROR = !conversion of string 'Infinity' to type flt failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT cast('Infinity' as real) / cast('Infinity' as real); ERROR = !conversion of string 'Infinity' to type flt failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 +QUERY = SELECT cast('nan' as real) / cast('nan' as real); +ERROR = !conversion of string 'nan' to type flt failed. +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT '' AS bad, f.f1 / '0.0' from FLOAT4_TBL f; ERROR = !division by zero. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT4_TBL f; ERROR = !syntax error, unexpected '.', expecting SCOLON in: "select '' as five, f.f1, @f." diff --git a/sql/test/pg_regress/Tests/float4.stable.out b/sql/test/pg_regress/Tests/float4.stable.out --- a/sql/test/pg_regress/Tests/float4.stable.out +++ b/sql/test/pg_regress/Tests/float4.stable.out @@ -42,36 +42,6 @@ Ready. [ 1 ] #INSERT INTO FLOAT4_TBL(f1) VALUES ('-10e-40'); [ 1 ] -#SELECT cast('NaN' as real); -% .L1 # table_name -% L1 # name -% real # type -% 15 # length -[ NULL ] -#SELECT cast('nan' as real); -% .L1 # table_name -% L1 # name -% real # type -% 15 # length -[ NULL ] -#SELECT cast(' NAN ' as real); -% .L1 # table_name -% L1 # name -% real # type -% 15 # length -[ NULL ] -#SELECT cast(' -INFINiTY ' as real); -% .L1 # table_name -% L1 # name -% real # type -% 15 # length -[ -inf ] -#SELECT cast('nan' as real) / cast('nan' as real); -% .L2 # table_name -% sql_div_single_value # name -% real # type -% 15 # length -[ NULL ] #SELECT '' AS five, * FROM FLOAT4_TBL; % .L, sys.float4_tbl # table_name % five, f1 # name diff --git a/sql/test/pg_regress/Tests/float8.stable.err b/sql/test/pg_regress/Tests/float8.stable.err --- a/sql/test/pg_regress/Tests/float8.stable.err +++ b/sql/test/pg_regress/Tests/float8.stable.err @@ -29,85 +29,106 @@ stderr of test 'float8` in directory 'sq # 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1142" "--port=38959" # 17:11:19 > -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT cast('10e400' as double); ERROR = !conversion of string '10e400' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT cast('-10e400' as double); ERROR = !conversion of string '-10e400' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES (' '); ERROR = !conversion of string ' ' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('xyz'); ERROR = !conversion of string 'xyz' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('5.0.0'); ERROR = !conversion of string '5.0.0' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('5 . 0'); ERROR = !conversion of string '5 . 0' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('5. 0'); ERROR = !conversion of string '5. 0' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES (' - 3'); ERROR = !conversion of string ' - 3' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('123 5'); ERROR = !conversion of string '123 5' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 +QUERY = SELECT cast('NaN' as double); +ERROR = !conversion of string 'NaN' to type dbl failed. +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 +QUERY = SELECT cast('nan' as double); +ERROR = !conversion of string 'nan' to type dbl failed. +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 +QUERY = SELECT cast(' NAN ' as double); +ERROR = !conversion of string ' NAN ' to type dbl failed. +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 +QUERY = SELECT cast('infinity' as double); +ERROR = !conversion of string 'infinity' to type dbl failed. +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 +QUERY = SELECT cast(' -INFINiTY ' as double); +ERROR = !conversion of string ' -INFINiTY ' to type dbl failed. +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT cast('N A N' as double); ERROR = !conversion of string 'N A N' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT cast('NaN x' as double); ERROR = !conversion of string 'NaN x' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT cast(' INFINITY x' as double); ERROR = !conversion of string ' INFINITY x' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT cast('Infinity' as double) + 100.0; -ERROR = !overflow in calculation inf+100. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +ERROR = !conversion of string 'Infinity' to type dbl failed. +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 +QUERY = SELECT cast('Infinity' as double) / cast('Infinity' as double); +ERROR = !conversion of string 'Infinity' to type dbl failed. +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 +QUERY = SELECT cast('nan' as double) / cast('nan' as double); +ERROR = !conversion of string 'nan' to type dbl failed. +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT '' AS five, f.f1, truncate(f1) AS trunc_f1 FROM FLOAT8_TBL f; ERROR = !SELECT: no such unary operator 'truncate(double)' -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT |/ cast('64' as double) AS eight; ERROR = !syntax error, unexpected '|' in: "select |" -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT '' AS three, f.f1, |/f.f1 AS sqrt_f1 FROM FLOAT8_TBL f WHERE f.f1 > '0.0'; ERROR = !syntax error, unexpected '|' in: "select '' as three, f.f1, |" -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT ||/ cast('27' as double) AS three; ERROR = !syntax error, unexpected CONCATSTRING in: "select ||" -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT '' AS five, f.f1, ||/f.f1 AS cbrt_f1 FROM FLOAT8_TBL f; ERROR = !syntax error, unexpected CONCATSTRING in: "select '' as five, f.f1, ||" -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT '' AS bad, f.f1 * '1e200' from FLOAT8_TBL f; ERROR = !overflow in calculation -1.2345678901234e+200*9.9999999999999997e+199. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f; ERROR = !decimal (1e20) doesn't have format (39.0) -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT '' AS bad, log(f.f1) from FLOAT8_TBL f where f.f1 = '0.0' ; ERROR = !Math exception: Numerical result out of range -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT '' AS bad, log(f.f1) from FLOAT8_TBL f where f.f1 < '0.0' ; ERROR = !Math exception: Numerical argument out of domain -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT '' AS bad, exp(f.f1) from FLOAT8_TBL f; ERROR = !Math exception: Numerical result out of range -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f; ERROR = !division by zero. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400'); ERROR = !conversion of string '10e400' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('-10e400'); ERROR = !conversion of string '-10e400' to type dbl failed. diff --git a/sql/test/pg_regress/Tests/float8.stable.err.Windows b/sql/test/pg_regress/Tests/float8.stable.err.Windows --- a/sql/test/pg_regress/Tests/float8.stable.err.Windows +++ b/sql/test/pg_regress/Tests/float8.stable.err.Windows @@ -29,103 +29,103 @@ stderr of test 'float8` in directory 'sq # 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1142" "--port=38959" # 17:11:19 > -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT cast('10e400' as double); ERROR = !conversion of string '10e400' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = SELECT cast('-10e400' as double); ERROR = !conversion of string '-10e400' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES (' '); ERROR = !conversion of string ' ' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('xyz'); ERROR = !conversion of string 'xyz' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('5.0.0'); ERROR = !conversion of string '5.0.0' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 +MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989 QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('5 . 0'); ERROR = !conversion of string '5 . 0' to type dbl failed. -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list