Changeset: 47be6ffbe1c7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=47be6ffbe1c7
Modified Files:
sql/test/pg_regress/Tests/int2.stable.err
sql/test/pg_regress/Tests/int2.stable.out
sql/test/pg_regress/Tests/int4.stable.err
sql/test/pg_regress/Tests/int4.stable.out
sql/test/pg_regress/Tests/int8.stable.err
sql/test/pg_regress/Tests/int8.stable.out
Branch: default
Log Message:
Adapted output of int2, int4 and int8 test cases.
The latest MonetDB accepts more string to int conversions.
Also with introduction of int128 some queries are now also possible.
diffs (truncated from 761 to 300 lines):
diff --git a/sql/test/pg_regress/Tests/int2.stable.err
b/sql/test/pg_regress/Tests/int2.stable.err
--- a/sql/test/pg_regress/Tests/int2.stable.err
+++ b/sql/test/pg_regress/Tests/int2.stable.err
@@ -29,31 +29,31 @@ stderr of test 'int2` in directory 'sql/
# 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-13408/.s.monetdb.33417
+MAPI = (monetdb) /var/tmp/mtest-5104/.s.monetdb.34046
QUERY = INSERT INTO INT2_TBL(f1) VALUES ('34.5');
ERROR = !conversion of string '34.5' to type sht failed.
-MAPI = (monetdb) /var/tmp/mtest-13408/.s.monetdb.33417
+MAPI = (monetdb) /var/tmp/mtest-5104/.s.monetdb.34046
QUERY = INSERT INTO INT2_TBL(f1) VALUES ('100000');
ERROR = !conversion of string '100000' to type sht failed.
-MAPI = (monetdb) /var/tmp/mtest-13408/.s.monetdb.33417
+MAPI = (monetdb) /var/tmp/mtest-5104/.s.monetdb.34046
QUERY = INSERT INTO INT2_TBL(f1) VALUES ('asdf');
ERROR = !conversion of string 'asdf' to type sht failed.
-MAPI = (monetdb) /var/tmp/mtest-13408/.s.monetdb.33417
+MAPI = (monetdb) /var/tmp/mtest-5104/.s.monetdb.34046
QUERY = INSERT INTO INT2_TBL(f1) VALUES (' ');
ERROR = !conversion of string ' ' to type sht failed.
-MAPI = (monetdb) /var/tmp/mtest-13408/.s.monetdb.33417
+MAPI = (monetdb) /var/tmp/mtest-5104/.s.monetdb.34046
QUERY = INSERT INTO INT2_TBL(f1) VALUES ('- 1234');
ERROR = !conversion of string '- 1234' to type sht failed.
-MAPI = (monetdb) /var/tmp/mtest-13408/.s.monetdb.33417
+MAPI = (monetdb) /var/tmp/mtest-5104/.s.monetdb.34046
QUERY = INSERT INTO INT2_TBL(f1) VALUES ('4 444');
ERROR = !conversion of string '4 444' to type sht failed.
-MAPI = (monetdb) /var/tmp/mtest-13408/.s.monetdb.33417
+MAPI = (monetdb) /var/tmp/mtest-5104/.s.monetdb.34046
QUERY = INSERT INTO INT2_TBL(f1) VALUES ('123 dt');
ERROR = !conversion of string '123 dt' to type sht failed.
-MAPI = (monetdb) /var/tmp/mtest-13408/.s.monetdb.33417
+MAPI = (monetdb) /var/tmp/mtest-5104/.s.monetdb.34046
QUERY = INSERT INTO INT2_TBL(f1) VALUES ('');
ERROR = !conversion of string '' to type sht failed.
-MAPI = (monetdb) /var/tmp/mtest-13408/.s.monetdb.33417
+MAPI = (monetdb) /var/tmp/mtest-5104/.s.monetdb.34046
QUERY = SELECT '' AS five, INT2_TBL.*;
ERROR = !Column expression Table 'int2_tbl' unknown
diff --git a/sql/test/pg_regress/Tests/int2.stable.out
b/sql/test/pg_regress/Tests/int2.stable.out
--- a/sql/test/pg_regress/Tests/int2.stable.out
+++ b/sql/test/pg_regress/Tests/int2.stable.out
@@ -49,6 +49,8 @@ Ready.
% five, f1 # name
% char, smallint # type
% 0, 6 # length
+[ "", 0 ]
+[ "", 1234 ]
[ "", -1234 ]
[ "", 32767 ]
[ "", -32767 ]
@@ -57,6 +59,7 @@ Ready.
% four, f1 # name
% char, smallint # type
% 0, 6 # length
+[ "", 1234 ]
[ "", -1234 ]
[ "", 32767 ]
[ "", -32767 ]
@@ -65,6 +68,7 @@ Ready.
% four, f1 # name
% char, smallint # type
% 0, 6 # length
+[ "", 1234 ]
[ "", -1234 ]
[ "", 32767 ]
[ "", -32767 ]
@@ -73,11 +77,13 @@ Ready.
% one, f1 # name
% char, smallint # type
% 0, 1 # length
+[ "", 0 ]
#SELECT '' AS one, i.* FROM INT2_TBL i WHERE i.f1 = cast('0' as integer);
% .L, sys.i # table_name
% one, f1 # name
% char, smallint # type
% 0, 1 # length
+[ "", 0 ]
#SELECT '' AS two, i.* FROM INT2_TBL i WHERE i.f1 < cast('0' as smallint);
% .L, sys.i # table_name
% two, f1 # name
@@ -97,6 +103,7 @@ Ready.
% three, f1 # name
% char, smallint # type
% 0, 6 # length
+[ "", 0 ]
[ "", -1234 ]
[ "", -32767 ]
#SELECT '' AS three, i.* FROM INT2_TBL i WHERE i.f1 <= cast('0' as integer);
@@ -104,6 +111,7 @@ Ready.
% three, f1 # name
% char, smallint # type
% 0, 6 # length
+[ "", 0 ]
[ "", -1234 ]
[ "", -32767 ]
#SELECT '' AS two, i.* FROM INT2_TBL i WHERE i.f1 > cast('0' as smallint);
@@ -111,24 +119,30 @@ Ready.
% two, f1 # name
% char, smallint # type
% 0, 5 # length
+[ "", 1234 ]
[ "", 32767 ]
#SELECT '' AS two, i.* FROM INT2_TBL i WHERE i.f1 > cast('0' as integer);
% .L, sys.i # table_name
% two, f1 # name
% char, smallint # type
% 0, 5 # length
+[ "", 1234 ]
[ "", 32767 ]
#SELECT '' AS three, i.* FROM INT2_TBL i WHERE i.f1 >= cast('0' as smallint);
% .L, sys.i # table_name
% three, f1 # name
% char, smallint # type
% 0, 5 # length
+[ "", 0 ]
+[ "", 1234 ]
[ "", 32767 ]
#SELECT '' AS three, i.* FROM INT2_TBL i WHERE i.f1 >= cast('0' as integer);
% .L, sys.i # table_name
% three, f1 # name
% char, smallint # type
% 0, 5 # length
+[ "", 0 ]
+[ "", 1234 ]
[ "", 32767 ]
#SELECT '' AS one, i.* FROM INT2_TBL i WHERE (i.f1 % cast('2' as smallint)) =
cast('1' as smallint);
% .L, sys.i # table_name
@@ -141,12 +155,16 @@ Ready.
% three, f1 # name
% char, smallint # type
% 0, 5 # length
+[ "", 0 ]
+[ "", 1234 ]
[ "", -1234 ]
#SELECT '' AS five, i.f1, i.f1 * cast('2' as smallint) AS x FROM INT2_TBL i;
% .L, sys.i, sys.L # table_name
% five, f1, x # name
% char, smallint, int # type
% 0, 6, 6 # length
+[ "", 0, 0 ]
+[ "", 1234, 2468 ]
[ "", -1234, -2468 ]
[ "", 32767, 65534 ]
[ "", -32767, -65534 ]
@@ -156,12 +174,16 @@ Ready.
% five, f1, x # name
% char, smallint, int # type
% 0, 5, 5 # length
+[ "", 0, 0 ]
+[ "", 1234, 2468 ]
[ "", -1234, -2468 ]
#SELECT '' AS five, i.f1, i.f1 * cast('2' as integer) AS x FROM INT2_TBL i;
% .L, sys.i, sys.L # table_name
% five, f1, x # name
-% char, smallint, bigint # type
+% char, smallint, hugeint # type
% 0, 6, 6 # length
+[ "", 0, 0 ]
+[ "", 1234, 2468 ]
[ "", -1234, -2468 ]
[ "", 32767, 65534 ]
[ "", -32767, -65534 ]
@@ -170,6 +192,8 @@ Ready.
% five, f1, x # name
% char, smallint, int # type
% 0, 6, 6 # length
+[ "", 0, 2 ]
+[ "", 1234, 1236 ]
[ "", -1234, -1232 ]
[ "", 32767, 32769 ]
[ "", -32767, -32765 ]
@@ -179,6 +203,8 @@ Ready.
% five, f1, x # name
% char, smallint, int # type
% 0, 6, 6 # length
+[ "", 0, 2 ]
+[ "", 1234, 1236 ]
[ "", -1234, -1232 ]
[ "", -32767, -32765 ]
#SELECT '' AS five, i.f1, i.f1 + cast('2' as integer) AS x FROM INT2_TBL i;
@@ -186,6 +212,8 @@ Ready.
% five, f1, x # name
% char, smallint, bigint # type
% 0, 6, 6 # length
+[ "", 0, 2 ]
+[ "", 1234, 1236 ]
[ "", -1234, -1232 ]
[ "", 32767, 32769 ]
[ "", -32767, -32765 ]
@@ -194,6 +222,8 @@ Ready.
% five, f1, x # name
% char, smallint, int # type
% 0, 6, 6 # length
+[ "", 0, -2 ]
+[ "", 1234, 1232 ]
[ "", -1234, -1236 ]
[ "", 32767, 32765 ]
[ "", -32767, -32769 ]
@@ -203,6 +233,8 @@ Ready.
% five, f1, x # name
% char, smallint, int # type
% 0, 5, 5 # length
+[ "", 0, -2 ]
+[ "", 1234, 1232 ]
[ "", -1234, -1236 ]
[ "", 32767, 32765 ]
#SELECT '' AS five, i.f1, i.f1 - cast('2' as integer) AS x FROM INT2_TBL i;
@@ -210,6 +242,8 @@ Ready.
% five, f1, x # name
% char, smallint, bigint # type
% 0, 6, 6 # length
+[ "", 0, -2 ]
+[ "", 1234, 1232 ]
[ "", -1234, -1236 ]
[ "", 32767, 32765 ]
[ "", -32767, -32769 ]
@@ -218,6 +252,8 @@ Ready.
% five, f1, x # name
% char, smallint, smallint # type
% 0, 6, 6 # length
+[ "", 0, 0 ]
+[ "", 1234, 617 ]
[ "", -1234, -617 ]
[ "", 32767, 16383 ]
[ "", -32767, -16383 ]
@@ -226,6 +262,8 @@ Ready.
% five, f1, x # name
% char, smallint, int # type
% 0, 6, 6 # length
+[ "", 0, 0 ]
+[ "", 1234, 617 ]
[ "", -1234, -617 ]
[ "", 32767, 16383 ]
[ "", -32767, -16383 ]
diff --git a/sql/test/pg_regress/Tests/int4.stable.err
b/sql/test/pg_regress/Tests/int4.stable.err
--- a/sql/test/pg_regress/Tests/int4.stable.err
+++ b/sql/test/pg_regress/Tests/int4.stable.err
@@ -29,43 +29,37 @@ stderr of test 'int4` in directory 'sql/
# 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-13408/.s.monetdb.33417
-QUERY = INSERT INTO INT4_TBL(f1) VALUES (' 0 ');
-ERROR = !conversion of string ' 0 ' to type int failed.
-MAPI = (monetdb) /var/tmp/mtest-13408/.s.monetdb.33417
-QUERY = INSERT INTO INT4_TBL(f1) VALUES ('123456 ');
-ERROR = !conversion of string '123456 ' to type int failed.
-MAPI = (monetdb) /var/tmp/mtest-13408/.s.monetdb.33417
+MAPI = (monetdb) /var/tmp/mtest-5270/.s.monetdb.30831
QUERY = INSERT INTO INT4_TBL(f1) VALUES ('34.5');
ERROR = !conversion of string '34.5' to type int failed.
-MAPI = (monetdb) /var/tmp/mtest-13408/.s.monetdb.33417
+MAPI = (monetdb) /var/tmp/mtest-5270/.s.monetdb.30831
QUERY = INSERT INTO INT4_TBL(f1) VALUES ('1000000000000');
ERROR = !conversion of string '1000000000000' to type int failed.
-MAPI = (monetdb) /var/tmp/mtest-13408/.s.monetdb.33417
+MAPI = (monetdb) /var/tmp/mtest-5270/.s.monetdb.30831
QUERY = INSERT INTO INT4_TBL(f1) VALUES ('asdf');
ERROR = !conversion of string 'asdf' to type int failed.
-MAPI = (monetdb) /var/tmp/mtest-13408/.s.monetdb.33417
+MAPI = (monetdb) /var/tmp/mtest-5270/.s.monetdb.30831
QUERY = INSERT INTO INT4_TBL(f1) VALUES (' ');
ERROR = !conversion of string ' ' to type int failed.
-MAPI = (monetdb) /var/tmp/mtest-13408/.s.monetdb.33417
+MAPI = (monetdb) /var/tmp/mtest-5270/.s.monetdb.30831
QUERY = INSERT INTO INT4_TBL(f1) VALUES (' asdf ');
ERROR = !conversion of string ' asdf ' to type int failed.
-MAPI = (monetdb) /var/tmp/mtest-13408/.s.monetdb.33417
+MAPI = (monetdb) /var/tmp/mtest-5270/.s.monetdb.30831
QUERY = INSERT INTO INT4_TBL(f1) VALUES ('- 1234');
ERROR = !conversion of string '- 1234' to type int failed.
-MAPI = (monetdb) /var/tmp/mtest-13408/.s.monetdb.33417
+MAPI = (monetdb) /var/tmp/mtest-5270/.s.monetdb.30831
QUERY = INSERT INTO INT4_TBL(f1) VALUES ('123 5');
ERROR = !conversion of string '123 5' to type int failed.
-MAPI = (monetdb) /var/tmp/mtest-13408/.s.monetdb.33417
+MAPI = (monetdb) /var/tmp/mtest-5270/.s.monetdb.30831
QUERY = INSERT INTO INT4_TBL(f1) VALUES ('');
ERROR = !conversion of string '' to type int failed.
-MAPI = (monetdb) /var/tmp/mtest-13408/.s.monetdb.33417
+MAPI = (monetdb) /var/tmp/mtest-5270/.s.monetdb.30831
QUERY = SELECT '' AS five, INT4_TBL.*;
ERROR = !Column expression Table 'int4_tbl' unknown
-MAPI = (monetdb) /var/tmp/mtest-13408/.s.monetdb.33417
+MAPI = (monetdb) /var/tmp/mtest-5270/.s.monetdb.30831
QUERY = SELECT 4! AS twenty_four;
ERROR = !unexpected symbol (!)
-MAPI = (monetdb) /var/tmp/mtest-13408/.s.monetdb.33417
+MAPI = (monetdb) /var/tmp/mtest-5270/.s.monetdb.30831
QUERY = SELECT !!3 AS six;
ERROR = !unexpected symbol (!)
diff --git a/sql/test/pg_regress/Tests/int4.stable.out
b/sql/test/pg_regress/Tests/int4.stable.out
--- a/sql/test/pg_regress/Tests/int4.stable.out
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
