Changeset: 070c71e46fb1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=070c71e46fb1
Modified Files:
sql/test/pg_regress/Tests/float8.sql
sql/test/pg_regress/Tests/float8.stable.err
sql/test/pg_regress/Tests/float8.stable.out
Branch: default
Log Message:
Updated float8.stable.*
It appears that 'Nan' and 'infinity' are now accepted by MonetDB string to num
converter
diffs (295 lines):
diff --git a/sql/test/pg_regress/Tests/float8.sql
b/sql/test/pg_regress/Tests/float8.sql
--- a/sql/test/pg_regress/Tests/float8.sql
+++ b/sql/test/pg_regress/Tests/float8.sql
@@ -40,8 +40,7 @@ SELECT cast('Infinity' as double) + 100.
SELECT cast('Infinity' as double) / cast('Infinity' as double);
SELECT cast('nan' as double) / cast('nan' as double);
-SELECT '' AS five, FLOAT8_TBL.*;
-SELECT '' AS five, * FROM FLOAT8_TBL;
+SELECT '' AS five, FLOAT8_TBL.* FROM FLOAT8_TBL;
SELECT '' AS four, f.* FROM FLOAT8_TBL f WHERE f.f1 <> '1004.3';
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,102 +29,87 @@ 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-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
QUERY = SELECT cast('10e400' as double);
ERROR = !conversion of string '10e400' to type dbl failed.
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
QUERY = SELECT cast('-10e400' as double);
ERROR = !conversion of string '-10e400' to type dbl failed.
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
-QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES (' ');
-ERROR = !conversion of string ' ' to type dbl failed.
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('xyz');
ERROR = !conversion of string 'xyz' to type dbl failed.
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
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-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('5 . 0');
ERROR = !conversion of string '5 . 0' to type dbl failed.
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('5. 0');
ERROR = !conversion of string '5. 0' to type dbl failed.
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES (' - 3');
ERROR = !conversion of string ' - 3' to type dbl failed.
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('123 5');
ERROR = !conversion of string '123 5' to type dbl failed.
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
-QUERY = SELECT cast(' NAN ' as double);
-ERROR = !conversion of string ' NAN ' to type dbl failed.
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
-QUERY = SELECT cast(' -INFINiTY ' as double);
-ERROR = !conversion of string ' -INFINiTY ' to type dbl failed.
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
QUERY = SELECT cast('N A N' as double);
ERROR = !conversion of string 'N A N' to type dbl failed.
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
QUERY = SELECT cast('NaN x' as double);
ERROR = !conversion of string 'NaN x' to type dbl failed.
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
QUERY = SELECT cast(' INFINITY x' as double);
ERROR = !conversion of string ' INFINITY x' to type dbl failed.
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
QUERY = SELECT cast('Infinity' as double) + 100.0;
ERROR = !overflow in calculation inf+100.
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
-QUERY = SELECT '' AS five, FLOAT8_TBL.*;
-ERROR = !Column expression Table 'float8_tbl' unknown
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
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-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
QUERY = SELECT sqrt(double '64') AS eight;
ERROR = !syntax error, unexpected sqlDOUBLE in: "select sqrt(double"
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
QUERY = SELECT |/ double '64' AS eight;
ERROR = !syntax error, unexpected '|' in: "select |"
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
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-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
QUERY = SELECT power(double '144', double '0.5');
ERROR = !syntax error, unexpected sqlDOUBLE in: "select power(double"
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
QUERY = SELECT '' AS three, f.f1, exp(ln(f.f1)) AS exp_ln_f1
FROM FLOAT8_TBL f
WHERE f.f1 > '0.0';
ERROR = !cannot use non GROUP BY column 'f1' in query results without an
aggregate function
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
QUERY = SELECT ||/ double '27' AS three;
ERROR = !syntax error, unexpected CONCATSTRING in: "select ||"
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
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-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
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-25387/.s.monetdb.38941
-QUERY = SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f;
-ERROR = !"1e2" is no decimal value (doesn't contain a '.')
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
QUERY = SELECT '' AS bad, ln(f.f1) from FLOAT8_TBL f where f.f1 = '0.0' ;
ERROR = !SELECT: no such unary operator 'ln(double)'
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
QUERY = SELECT '' AS bad, ln(f.f1) from FLOAT8_TBL f where f.f1 < '0.0' ;
ERROR = !SELECT: no such unary operator 'ln(double)'
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
QUERY = SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f;
ERROR = !division by zero.
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400');
ERROR = !conversion of string '10e400' to type dbl failed.
-MAPI = (monetdb) /var/tmp/mtest-25387/.s.monetdb.38941
+MAPI = (monetdb) /var/tmp/mtest-29674/.s.monetdb.30067
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.out
b/sql/test/pg_regress/Tests/float8.stable.out
--- a/sql/test/pg_regress/Tests/float8.stable.out
+++ b/sql/test/pg_regress/Tests/float8.stable.out
@@ -52,6 +52,8 @@ Ready.
% double # type
% 24 # length
[ -0 ]
+#INSERT INTO FLOAT8_TBL(f1) VALUES (' ');
+[ 1 ]
#SELECT cast('NaN' as double);
% .L # table_name
% single_value # name
@@ -64,12 +66,24 @@ Ready.
% double # type
% 24 # length
[ NULL ]
+#SELECT cast(' NAN ' as double);
+% .L # table_name
+% single_value # name
+% double # type
+% 24 # length
+[ NULL ]
#SELECT cast('infinity' as double);
% .L # table_name
% single_value # name
% double # type
% 24 # length
[ inf ]
+#SELECT cast(' -INFINiTY ' as double);
+% .L # table_name
+% single_value # name
+% double # type
+% 24 # length
+[ -inf ]
#SELECT cast('Infinity' as double) / cast('Infinity' as double);
% .L # table_name
% sql_div_single_value # name
@@ -92,6 +106,7 @@ Ready.
[ "", -34 ]
[ "", 1 ]
[ "", 1 ]
+[ "", NULL ]
#SELECT '' AS four, f.* FROM FLOAT8_TBL f WHERE f.f1 <> '1004.3';
% .L, sys.f # table_name
% four, f1 # name
@@ -186,7 +201,7 @@ Ready.
% .L, sys.L # table_name
% one, square_f1 # name
% char, decimal # type
-% 0, 20 # length
+% 0, 40 # length
[ "", 1006 ]
#SELECT '' AS five, f.f1, abs(f1) AS abs_f1
# FROM FLOAT8_TBL f;
@@ -199,6 +214,7 @@ Ready.
[ "", -34, 34 ]
[ "", 1, 1 ]
[ "", 1, 1 ]
+[ "", NULL, NULL ]
#SELECT '' AS five, f.f1, round(f.f1, 0) AS round_f1
# FROM FLOAT8_TBL f;
% .L, sys.f, sys.L # table_name
@@ -210,6 +226,7 @@ Ready.
[ "", -34, -35 ]
[ "", 1, 1 ]
[ "", 1, 0 ]
+[ "", NULL, NULL ]
#select ceil(f1) as ceil_f1 from float8_tbl f;
% sys.L # table_name
% ceil_f1 # name
@@ -220,6 +237,7 @@ Ready.
[ -34 ]
[ 1 ]
[ 1 ]
+[ NULL ]
#select ceiling(f1) as ceiling_f1 from float8_tbl f;
% sys.L # table_name
% ceiling_f1 # name
@@ -230,6 +248,7 @@ Ready.
[ -34 ]
[ 1 ]
[ 1 ]
+[ NULL ]
#select floor(f1) as floor_f1 from float8_tbl f;
% sys.L # table_name
% floor_f1 # name
@@ -240,8 +259,7 @@ Ready.
[ -35 ]
[ 1 ]
[ 0 ]
-
-#-- sign
+[ NULL ]
#select sign(f1) as sign_f1 from float8_tbl f;
% sys.L # table_name
% sign_f1 # name
@@ -252,6 +270,7 @@ Ready.
[ -1 ]
[ 1 ]
[ 1 ]
+[ NULL ]
#SELECT '' AS five, * FROM FLOAT8_TBL;
% .L, sys.float8_tbl # table_name
% five, f1 # name
@@ -262,10 +281,22 @@ Ready.
[ "", -34 ]
[ "", 1 ]
[ "", 1 ]
+[ "", NULL ]
#UPDATE FLOAT8_TBL
# SET f1 = FLOAT8_TBL.f1 * '-1'
# WHERE FLOAT8_TBL.f1 > '0.0';
[ 3 ]
+#SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f;
+% .L, sys.L # table_name
+% bad, bit_xor_f1 # name
+% char, decimal # type
+% 0, 40 # length
+[ "", 632 ]
+[ "", -404 ]
+[ "", -602 ]
+[ "", 632 ]
+[ "", 632 ]
+[ "", NULL ]
#SELECT '' AS bad, exp(f.f1) from FLOAT8_TBL f;
% .L, sys.L # table_name
% bad, exp_f1 # name
@@ -276,6 +307,7 @@ Ready.
[ "", 7 ]
[ "", 0 ]
[ "", 1 ]
+[ "", NULL ]
#SELECT '' AS five, * FROM FLOAT8_TBL;
% .L, sys.float8_tbl # table_name
% five, f1 # name
@@ -286,12 +318,13 @@ Ready.
[ "", -34 ]
[ "", -1 ]
[ "", -1 ]
+[ "", NULL ]
#INSERT INTO FLOAT8_TBL(f1) VALUES ('10e-400');
[ 1 ]
#INSERT INTO FLOAT8_TBL(f1) VALUES ('-10e-400');
[ 1 ]
#DELETE FROM FLOAT8_TBL;
-[ 7 ]
+[ 8 ]
#INSERT INTO FLOAT8_TBL(f1) VALUES ('0.0');
[ 1 ]
#INSERT INTO FLOAT8_TBL(f1) VALUES ('-34.84');
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
