Changeset: c268adbda9f7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c268adbda9f7
Modified Files:
sql/test/pg_regress/Tests/float8.sql
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
sql/test/pg_regress/Tests/strings.sql
sql/test/pg_regress/Tests/strings.stable.err
sql/test/pg_regress/Tests/strings.stable.err.int128
sql/test/pg_regress/Tests/strings.stable.out
Branch: transaction-replication
Log Message:
Megre with default branch
diffs (269 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
@@ -131,11 +131,11 @@ SELECT '' AS bad, f.f1 * '1e200' from FL
SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f;
-SELECT '' AS bad, log(f.f1) from FLOAT8_TBL f where f.f1 = '0.0' ;
+-- SELECT '' AS bad, log(f.f1) from FLOAT8_TBL f where f.f1 = '0.0' ;
-SELECT '' AS bad, log(f.f1) from FLOAT8_TBL f where f.f1 < '0.0' ;
+SELECT '' AS bad, log(-f.f1) from FLOAT8_TBL f where f.f1 < '0.0' ;
-SELECT '' AS bad, exp(f.f1) from FLOAT8_TBL f;
+SELECT '' AS bad, exp(-f.f1) from FLOAT8_TBL f where f.f1 > '-1000.0' ;
SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f;
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
@@ -114,15 +114,6 @@ MAPI = (monetdb) /var/tmp/mtest-30808/.
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-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-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-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-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-30808/.s.monetdb.35989
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
@@ -114,15 +114,6 @@ MAPI = (monetdb) /var/tmp/mtest-30808/.
QUERY = SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f;
ERROR = !decimal (1e20) doesn't have format (19.0)
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: Result too large
-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: Domain error
-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-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-30808/.s.monetdb.35989
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
@@ -257,6 +257,25 @@ Ready.
# SET f1 = FLOAT8_TBL.f1 * '-1'
# WHERE FLOAT8_TBL.f1 > '0.0';
[ 3 ]
+#SELECT '' AS bad, log(-f.f1) from FLOAT8_TBL f where f.f1 < '0.0' ;
+% ., sys. # table_name
+# .L, sys.L # table_name
+% bad, log_sql_neg_f1 # name
+% char, double # type
+% 0, 24 # length
+[ "", 6.91204606 ]
+[ "", 3.550766152 ]
+[ "", 460.7277396 ]
+[ "", -460.3062976 ]
+#SELECT '' AS bad, exp(-f.f1) from FLOAT8_TBL f where f.f1 > '-1000.0' ;
+% ., sys. # table_name
+# .L, sys.L # table_name
+% bad, exp_sql_neg_f1 # name
+% char, double # type
+% 0, 24 # length
+[ "", 1 ]
+[ "", 1.351511513e+15 ]
+[ "", 1 ]
#SELECT '' AS five, * FROM FLOAT8_TBL;
% .L, sys.float8_tbl # table_name
% five, f1 # name
diff --git a/sql/test/pg_regress/Tests/float8.stable.out.Windows
b/sql/test/pg_regress/Tests/float8.stable.out.Windows
--- a/sql/test/pg_regress/Tests/float8.stable.out.Windows
+++ b/sql/test/pg_regress/Tests/float8.stable.out.Windows
@@ -257,6 +257,25 @@ Ready.
# SET f1 = FLOAT8_TBL.f1 * '-1'
# WHERE FLOAT8_TBL.f1 > '0.0';
[ 3 ]
+#SELECT '' AS bad, log(-f.f1) from FLOAT8_TBL f where f.f1 < '0.0' ;
+% ., sys. # table_name
+# .L, sys.L # table_name
+% bad, log_sql_neg_f1 # name
+% char, double # type
+% 0, 24 # length
+[ "", 6.91204606 ]
+[ "", 3.550766152 ]
+[ "", 460.7277396 ]
+[ "", -460.3062976 ]
+#SELECT '' AS bad, exp(-f.f1) from FLOAT8_TBL f where f.f1 > '-1000.0' ;
+% ., sys. # table_name
+# .L, sys.L # table_name
+% bad, exp_sql_neg_f1 # name
+% char, double # type
+% 0, 24 # length
+[ "", 1 ]
+[ "", 1.351511513e+15 ]
+[ "", 1 ]
#SELECT '' AS bad, exp(f.f1) from FLOAT8_TBL f;
% ., sys. # table_name
# .L, sys.L # table_name
diff --git a/sql/test/pg_regress/Tests/strings.sql
b/sql/test/pg_regress/Tests/strings.sql
--- a/sql/test/pg_regress/Tests/strings.sql
+++ b/sql/test/pg_regress/Tests/strings.sql
@@ -330,20 +330,12 @@ SELECT replace('yabadoo', 'bad', '') AS
select split_part('joeuser@mydatabase','@',0) AS "an error";
select split_part('joeuser@mydatabase','@',1) AS "joeuser";
--- MonetDB does not support split_part() but in some cases it can be replaced
by using substring() and locate(), such as:
-select substring('joeuser@mydatabase', 0, locate('@','joeuser@mydatabase', 0)
-1) AS "joeuser";
select split_part('joeuser@mydatabase','@',2) AS "mydatabase";
--- MonetDB does not support split_part() but in some cases it can be replaced
by using substring() and locate(), such as:
-select substring('joeuser@mydatabase', locate('@','joeuser@mydatabase', 0) +1)
AS "mydatabase";
select split_part('joeuser@mydatabase','@',3) AS "empty string";
--- MonetDB does not support split_part() but in some cases it can be replaced
by using substring() and locate(), such as:
-select substring('joeuser@mydatabase', locate('@','joeuser@mydatabase', 1) +1,
locate('@','joeuser@mydatabase', 2) -1) AS "empty string";
select split_part('@joeuser@mydatabase@','@',2) AS "joeuser";
--- MonetDB does not support split_part() but in some cases it can be replaced
by using substring() and locate(), such as:
-select substring('@joeuser@mydatabase@', locate('@','@joeuser@mydatabase@', 0)
+1, locate('@','@joeuser@mydatabase@', 1) -1) AS "joeuser";
--
-- test to_hex
diff --git a/sql/test/pg_regress/Tests/strings.stable.err
b/sql/test/pg_regress/Tests/strings.stable.err
--- a/sql/test/pg_regress/Tests/strings.stable.err
+++ b/sql/test/pg_regress/Tests/strings.stable.err
@@ -76,19 +76,7 @@ QUERY = insert into toasttest values(dec
ERROR = !SELECT: no such binary operator 'decode(char,char)'
MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
QUERY = select split_part('joeuser@mydatabase','@',0) AS "an error";
-ERROR = !SELECT: no such operator 'split_part'
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = select split_part('joeuser@mydatabase','@',1) AS "joeuser";
-ERROR = !SELECT: no such operator 'split_part'
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = select split_part('joeuser@mydatabase','@',2) AS "mydatabase";
-ERROR = !SELECT: no such operator 'split_part'
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = select split_part('joeuser@mydatabase','@',3) AS "empty string";
-ERROR = !SELECT: no such operator 'split_part'
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = select split_part('@joeuser@mydatabase@','@',2) AS "joeuser";
-ERROR = !SELECT: no such operator 'split_part'
+ERROR = !field position must be greater than zero
MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
QUERY = select to_hex(256*256*256 - 1) AS "ffffff";
ERROR = !SELECT: no such unary operator 'to_hex(bigint)'
@@ -96,14 +84,6 @@ MAPI = (monetdb) /var/tmp/mtest-29915/.
QUERY = select to_hex(cast(256 as bigint)*cast(256 as bigint)*cast(256 as
bigint)*cast(256 as bigint) - 1) AS "ffffffff";
ERROR = !SELECT: no such unary operator 'to_hex(bigint)'
-
-
-
-
-
-
-
-
# 17:11:19 >
# 17:11:19 > "Done."
# 17:11:19 >
diff --git a/sql/test/pg_regress/Tests/strings.stable.err.int128
b/sql/test/pg_regress/Tests/strings.stable.err.int128
--- a/sql/test/pg_regress/Tests/strings.stable.err.int128
+++ b/sql/test/pg_regress/Tests/strings.stable.err.int128
@@ -76,19 +76,7 @@ QUERY = insert into toasttest values(dec
ERROR = !SELECT: no such binary operator 'decode(char,char)'
MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
QUERY = select split_part('joeuser@mydatabase','@',0) AS "an error";
-ERROR = !SELECT: no such operator 'split_part'
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = select split_part('joeuser@mydatabase','@',1) AS "joeuser";
-ERROR = !SELECT: no such operator 'split_part'
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = select split_part('joeuser@mydatabase','@',2) AS "mydatabase";
-ERROR = !SELECT: no such operator 'split_part'
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = select split_part('joeuser@mydatabase','@',3) AS "empty string";
-ERROR = !SELECT: no such operator 'split_part'
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = select split_part('@joeuser@mydatabase@','@',2) AS "joeuser";
-ERROR = !SELECT: no such operator 'split_part'
+ERROR = !field position must be greater than zero
MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
QUERY = select to_hex(256*256*256 - 1) AS "ffffff";
ERROR = !SELECT: no such unary operator 'to_hex(hugeint)'
@@ -96,14 +84,6 @@ MAPI = (monetdb) /var/tmp/mtest-29915/.
QUERY = select to_hex(cast(256 as bigint)*cast(256 as bigint)*cast(256 as
bigint)*cast(256 as bigint) - 1) AS "ffffffff";
ERROR = !SELECT: no such unary operator 'to_hex(hugeint)'
-
-
-
-
-
-
-
-
# 17:11:19 >
# 17:11:19 > "Done."
# 17:11:19 >
diff --git a/sql/test/pg_regress/Tests/strings.stable.out
b/sql/test/pg_regress/Tests/strings.stable.out
--- a/sql/test/pg_regress/Tests/strings.stable.out
+++ b/sql/test/pg_regress/Tests/strings.stable.out
@@ -689,30 +689,36 @@ Ready.
% char # type
% 0 # length
[ "yaoo" ]
-#select substring('joeuser@mydatabase', 0, locate('@','joeuser@mydatabase', 0)
-1) AS "joeuser";
-% .L # table_name
+
+#select split_part('joeuser@mydatabase','@',1) AS "joeuser";
+% . # table_name
+# .L # table_name
% joeuser # name
% char # type
% 18 # length
-[ "joeuser" ]
-#select substring('joeuser@mydatabase', locate('@','joeuser@mydatabase', 0)
+1) AS "mydatabase";
-% .L # table_name
+[ "joeuser" ]
+#select split_part('joeuser@mydatabase','@',2) AS "mydatabase";
+% . # table_name
+# .L # table_name
% mydatabase # name
% char # type
% 18 # length
-[ "mydatabase" ]
-#select substring('joeuser@mydatabase', locate('@','joeuser@mydatabase', 1)
+1, locate('@','joeuser@mydatabase', 2) -1) AS "empty string";
-% .L # table_name
+[ "mydatabase" ]
+#select split_part('joeuser@mydatabase','@',3) AS "empty string";
+% . # table_name
+# .L # table_name
% empty string # name
% char # type
% 18 # length
-[ "mydatab" ]
-#select substring('@joeuser@mydatabase@', locate('@','@joeuser@mydatabase@',
0) +1, locate('@','@joeuser@mydatabase@', 1) -1) AS "joeuser";
-% .L # table_name
+[ "" ]
+#select split_part('@joeuser@mydatabase@','@',2) AS "joeuser";
+% . # table_name
+# .L # table_name
% joeuser # name
% char # type
-% 20 # length
-[ "" ]
+% 18 # length
+[ "joeuser" ]
+
#select md5('') = 'd41d8cd98f00b204e9800998ecf8427e' AS "TRUE";
% .L # table_name
% TRUE # name
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
