Changeset: 72bff7922746 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=72bff7922746
Modified Files:
sql/test/pg_regress/Tests/char.sql
sql/test/pg_regress/Tests/char.stable.err
sql/test/pg_regress/Tests/char.stable.out
sql/test/pg_regress/Tests/float4.sql
sql/test/pg_regress/Tests/float4.stable.err
sql/test/pg_regress/Tests/float4.stable.out
sql/test/pg_regress/Tests/float8.sql
sql/test/pg_regress/Tests/float8.stable.err
sql/test/pg_regress/Tests/float8.stable.out
sql/test/pg_regress/Tests/int2.sql
sql/test/pg_regress/Tests/int2.stable.err
sql/test/pg_regress/Tests/int2.stable.out
sql/test/pg_regress/Tests/int4.sql
sql/test/pg_regress/Tests/int4.stable.err
sql/test/pg_regress/Tests/int4.stable.out
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/numerology.sql
sql/test/pg_regress/Tests/polygon.sql
sql/test/pg_regress/postgresql2sql99.sh
Branch: transaction-replication
Log Message:
Merge with default branch
diffs (truncated from 3372 to 300 lines):
diff --git a/sql/test/pg_regress/Tests/char.sql
b/sql/test/pg_regress/Tests/char.sql
--- a/sql/test/pg_regress/Tests/char.sql
+++ b/sql/test/pg_regress/Tests/char.sql
@@ -5,7 +5,7 @@
-- fixed-length by value
-- internally passed by value if <= 4 bytes in storage
-SELECT char 'c' = char 'c' AS true;
+SELECT cast('c' as char) = cast('c' as char) AS "true";
--
-- Build a table for testing
diff --git a/sql/test/pg_regress/Tests/char.stable.err
b/sql/test/pg_regress/Tests/char.stable.err
--- a/sql/test/pg_regress/Tests/char.stable.err
+++ b/sql/test/pg_regress/Tests/char.stable.err
@@ -70,23 +70,16 @@ stderr of test 'char` in directory 'sql/
# 22:08:26 >
-# 22:08:26 >
-# 22:08:26 > Mtimeout -timeout 60 mclient -lsql -umonetdb -Pmonetdb
--host=pegasus --port=38104 -e <
../../../../../../../../../../mirror/fabian/monetdb/current/sql/src/test/pg_regress/Tests/../monetdb/char.sql
-# 22:08:26 >
-
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
-QUERY = SELECT char 'c' = char 'c' AS true;
-ERROR = !syntax error, unexpected CHARACTER in: "select char"
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
+MAPI = (monetdb) /var/tmp/mtest-23239/.s.monetdb.35232
QUERY = INSERT INTO CHAR_TBL (f1) VALUES ('cd');
ERROR = !value too long for type (var)char(1)
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
+MAPI = (monetdb) /var/tmp/mtest-23239/.s.monetdb.35232
QUERY = INSERT INTO CHAR_TBL (f1) VALUES ('c ');
ERROR = !value too long for type (var)char(1)
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
+MAPI = (monetdb) /var/tmp/mtest-23239/.s.monetdb.35232
QUERY = INSERT INTO CHAR_TBL (f1) VALUES ('abcde');
ERROR = !value too long for type (var)char(4)
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
+MAPI = (monetdb) /var/tmp/mtest-23239/.s.monetdb.35232
QUERY = INSERT INTO CHAR_TBL (f1) VALUES ('abcd ');
ERROR = !value too long for type (var)char(4)
diff --git a/sql/test/pg_regress/Tests/char.stable.out
b/sql/test/pg_regress/Tests/char.stable.out
--- a/sql/test/pg_regress/Tests/char.stable.out
+++ b/sql/test/pg_regress/Tests/char.stable.out
@@ -34,7 +34,12 @@ Ready.
#--
#-- fixed-length by value
#-- internally passed by value if <= 4 bytes in storage
-#SELECT char 'c' = char 'c' AS true;
+#SELECT cast('c' as char) = cast('c' as char) AS "true";
+% .L # table_name
+% true # name
+% boolean # type
+% 5 # length
+[ true ]
#--
#-- Build a table for testing
#--
diff --git a/sql/test/pg_regress/Tests/float4.sql
b/sql/test/pg_regress/Tests/float4.sql
--- a/sql/test/pg_regress/Tests/float4.sql
+++ b/sql/test/pg_regress/Tests/float4.sql
@@ -2,7 +2,7 @@
-- float
--
-CREATE TABLE FLOAT4_TBL (f1 float);
+CREATE TABLE FLOAT4_TBL (f1 real);
INSERT INTO FLOAT4_TBL(f1) VALUES (' 0.0');
INSERT INTO FLOAT4_TBL(f1) VALUES ('1004.30 ');
@@ -26,22 +26,23 @@ INSERT INTO FLOAT4_TBL(f1) VALUES ('
INSERT INTO FLOAT4_TBL(f1) VALUES ('123 5');
-- special inputs
-SELECT 'NaN'::float;
-SELECT 'nan'::float;
-SELECT ' NAN '::float;
-SELECT 'infinity'::float;
-SELECT ' -INFINiTY '::float;
+SELECT cast('NaN' as real);
+SELECT cast('nan' as real);
+SELECT cast(' NAN ' as real);
+SELECT cast('infinity' as real);
+SELECT cast(' -INFINiTY ' as real);
-- bad special inputs
-SELECT 'N A N'::float;
-SELECT 'NaN x'::float;
-SELECT ' INFINITY x'::float;
+SELECT cast('N A N' as real);
+SELECT cast('NaN x' as real);
+SELECT cast(' INFINITY x' as real);
-SELECT 'Infinity'::float + 100.0;
-SELECT 'Infinity'::float / 'Infinity'::float;
-SELECT 'nan'::float / 'nan'::float;
+SELECT cast('Infinity' as real) + 100.0;
+SELECT cast('Infinity' as real) / cast('Infinity' as real);
+SELECT cast('nan' as real) / cast('nan' as real);
SELECT '' AS five, FLOAT4_TBL.*;
+SELECT '' AS five, * FROM FLOAT4_TBL;
SELECT '' AS four, f.* FROM FLOAT4_TBL f WHERE f.f1 <> '1004.3';
@@ -70,7 +71,7 @@ SELECT '' AS three, f.f1, f.f1 - '-10' A
-- test divide by zero
SELECT '' AS bad, f.f1 / '0.0' from FLOAT4_TBL f;
-SELECT '' AS five, FLOAT4_TBL.*;
+SELECT '' AS five, * FROM FLOAT4_TBL;
-- test the unary float4abs operator
SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT4_TBL f;
@@ -79,5 +80,7 @@ UPDATE FLOAT4_TBL
SET f1 = FLOAT4_TBL.f1 * '-1'
WHERE FLOAT4_TBL.f1 > '0.0';
-SELECT '' AS five, FLOAT4_TBL.*;
+SELECT '' AS five, * FROM FLOAT4_TBL;
+-- cleanup created table
+DROP TABLE FLOAT4_TBL;
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,63 +29,66 @@ 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 >
-#--
-#-- float
-#--
-#-- test for over and under flow
-MAPI = (monetdb) /var/tmp/mtest-12345/.s.monetdb.54321
+MAPI = (monetdb) /var/tmp/mtest-25217/.s.monetdb.33492
QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('10e40');
-ERROR = type "real" value out of range: overflow
-MAPI = (monetdb) /var/tmp/mtest-12345/.s.monetdb.54321
+ERROR = !conversion of string '10e40' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-25217/.s.monetdb.33492
QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('-10e40');
-ERROR = type "real" value out of range: overflow
-MAPI = (monetdb) /var/tmp/mtest-12345/.s.monetdb.54321
-QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('10e-40');
-ERROR = type "real" value out of range: underflow
-MAPI = (monetdb) /var/tmp/mtest-12345/.s.monetdb.54321
-QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('-10e-40');
-ERROR = type "real" value out of range: underflow
-#-- bad input
-MAPI = (monetdb) /var/tmp/mtest-12345/.s.monetdb.54321
+ERROR = !conversion of string '-10e40' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-25217/.s.monetdb.33492
QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES (' ');
-ERROR = invalid input syntax for type real: " "
-MAPI = (monetdb) /var/tmp/mtest-12345/.s.monetdb.54321
+ERROR = !conversion of string ' ' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-25217/.s.monetdb.33492
QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('xyz');
-ERROR = invalid input syntax for type real: "xyz"
-MAPI = (monetdb) /var/tmp/mtest-12345/.s.monetdb.54321
+ERROR = !conversion of string 'xyz' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-25217/.s.monetdb.33492
QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('5.0.0');
-ERROR = invalid input syntax for type real: "5.0.0"
-MAPI = (monetdb) /var/tmp/mtest-12345/.s.monetdb.54321
+ERROR = !conversion of string '5.0.0' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-25217/.s.monetdb.33492
QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('5 . 0');
-ERROR = invalid input syntax for type real: "5 . 0"
-MAPI = (monetdb) /var/tmp/mtest-12345/.s.monetdb.54321
+ERROR = !conversion of string '5 . 0' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-25217/.s.monetdb.33492
QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('5. 0');
-ERROR = invalid input syntax for type real: "5. 0"
-MAPI = (monetdb) /var/tmp/mtest-12345/.s.monetdb.54321
+ERROR = !conversion of string '5. 0' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-25217/.s.monetdb.33492
QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES (' - 3.0');
-ERROR = invalid input syntax for type real: " - 3.0"
-MAPI = (monetdb) /var/tmp/mtest-12345/.s.monetdb.54321
+ERROR = !conversion of string ' - 3.0' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-25217/.s.monetdb.33492
QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('123 5');
-ERROR = invalid input syntax for type real: "123 5"
-#-- special inputs
-#-- bad special inputs
-MAPI = (monetdb) /var/tmp/mtest-12345/.s.monetdb.54321
-QUERY = SELECT 'N A N'::float;
-ERROR = invalid input syntax for type real: "N A N"
-MAPI = (monetdb) /var/tmp/mtest-12345/.s.monetdb.54321
-QUERY = SELECT 'NaN x'::float;
-ERROR = invalid input syntax for type real: "NaN x"
-MAPI = (monetdb) /var/tmp/mtest-12345/.s.monetdb.54321
-QUERY = SELECT ' INFINITY x'::float;
-ERROR = invalid input syntax for type real: " INFINITY x"
-MAPI = (monetdb) /var/tmp/mtest-12345/.s.monetdb.54321
-QUERY = SELECT 'Infinity'::float + 100.0;
-ERROR = type "double precision" value out of range: overflow
-#-- test divide by zero
-MAPI = (monetdb) /var/tmp/mtest-12345/.s.monetdb.54321
+ERROR = !conversion of string '123 5' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-25217/.s.monetdb.33492
+QUERY = SELECT cast(' NAN ' as real);
+ERROR = !conversion of string ' NAN ' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-25217/.s.monetdb.33492
+QUERY = SELECT cast('infinity' as real);
+ERROR = !conversion of string 'infinity' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-25217/.s.monetdb.33492
+QUERY = SELECT cast(' -INFINiTY ' as real);
+ERROR = !conversion of string ' -INFINiTY ' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-25217/.s.monetdb.33492
+QUERY = SELECT cast('N A N' as real);
+ERROR = !conversion of string 'N A N' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-25217/.s.monetdb.33492
+QUERY = SELECT cast('NaN x' as real);
+ERROR = !conversion of string 'NaN x' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-25217/.s.monetdb.33492
+QUERY = SELECT cast(' INFINITY x' as real);
+ERROR = !conversion of string ' INFINITY x' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-25217/.s.monetdb.33492
+QUERY = SELECT cast('Infinity' as real) + 100.0;
+ERROR = !conversion of string 'Infinity' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-25217/.s.monetdb.33492
+QUERY = SELECT cast('Infinity' as real) / cast('Infinity' as real);
+ERROR = !conversion of string 'Infinity' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-25217/.s.monetdb.33492
+QUERY = SELECT '' AS five, FLOAT4_TBL.*;
+ERROR = !Column expression Table 'float4_tbl' unknown
+MAPI = (monetdb) /var/tmp/mtest-25217/.s.monetdb.33492
QUERY = SELECT '' AS bad, f.f1 / '0.0' from FLOAT4_TBL f;
-ERROR = division by zero
-#-- test the unary float4abs operator
+ERROR = !division by zero.
+MAPI = (monetdb) /var/tmp/mtest-25217/.s.monetdb.33492
+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."
# 17:11:19 >
# 17:11:19 > "Done."
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
@@ -1,4 +1,4 @@
-stdout of test 'float` in directory 'sql/test/pg_regress` itself:
+stdout of test 'float4` in directory 'sql/test/pg_regress` itself:
# 17:11:18 >
@@ -40,223 +40,170 @@ Ready.
[ 1 ]
#INSERT INTO FLOAT4_TBL(f1) VALUES ('1.2345678901234e-20');
[ 1 ]
-#-- test for over and under flow
-#
-#
-#
-#
-#-- bad input
-#
-#
-#
-#
-#
-#
-#
-#-- special inputs
-#SELECT 'NaN'::float;
-% sys.L0 # table_name
-% float # name
-% ? # type
-% ? # length
-[ "NaN" ]
-
-#SELECT 'nan'::float;
-% sys.L0 # table_name
-% float # name
-% ? # type
-% ? # length
-[ "NaN" ]
-
-#SELECT ' NAN '::float;
-% sys.L0 # table_name
-% float # name
-% ? # type
-% ? # length
-[ "NaN" ]
-
-#SELECT 'infinity'::float;
-% sys.L0 # table_name
-% float # name
-% ? # type
-% ? # length
-[ "Infinity" ]
-
-#SELECT ' -INFINiTY '::float;
-% sys.L0 # table_name
-% float # name
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
