Changeset: 05b3b63fd676 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=05b3b63fd676
Modified Files:
sql/jdbc/tests/Tests/All
sql/test/pg_regress/Tests/numeric.stable.err
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql
Branch: Dec2016
Log Message:
Approve changed err output
diffs (94 lines):
diff --git a/sql/jdbc/tests/Tests/All b/sql/jdbc/tests/Tests/All
--- a/sql/jdbc/tests/Tests/All
+++ b/sql/jdbc/tests/Tests/All
@@ -33,3 +33,4 @@ HAVE_JDBCTESTS?BugExecuteUpdate_Bug_3350
HAVE_JDBCTESTS?BugDatabaseMetaData_Bug_3356
HAVE_JDBCTESTS?BugSetQueryTimeout_Bug_3357
HAVE_JDBCTESTS?BugDecimalRound_Bug_3561
+HAVE_JDBCTESTS?BugResultSetMetaData_Bug_6183
diff --git a/sql/test/pg_regress/Tests/numeric.stable.err
b/sql/test/pg_regress/Tests/numeric.stable.err
--- a/sql/test/pg_regress/Tests/numeric.stable.err
+++ b/sql/test/pg_regress/Tests/numeric.stable.err
@@ -116,25 +116,25 @@ QUERY = SELECT t1.id1, t1.id2, t1.result
FROM num_result t1, num_exp_add t2
WHERE t1.id1 = t2.id1 AND t1.id2 = t2.id2
AND t1.result <> round(t2.expected, 20);
-ERROR = !too many digits (19 > 5)
+ERROR = !too many digits (28 > 5)
MAPI = (monetdb) /var/tmp/mtest-11592/.s.monetdb.39445
QUERY = SELECT t1.id1, t1.id2, t1.result, round(t2.expected, 40) as expected
FROM num_result t1, num_exp_sub t2
WHERE t1.id1 = t2.id1 AND t1.id2 = t2.id2
AND t1.result <> round(t2.expected, 40);
-ERROR = !too many digits (19 > 6)
+ERROR = !too many digits (28 > 6)
MAPI = (monetdb) /var/tmp/mtest-11592/.s.monetdb.39445
QUERY = SELECT t1.id1, t1.id2, t1.result, round(t2.expected, 30) as expected
FROM num_result t1, num_exp_mul t2
WHERE t1.id1 = t2.id1 AND t1.id2 = t2.id2
AND t1.result <> round(t2.expected, 30);
-ERROR = !too many digits (19 > 5)
+ERROR = !too many digits (36 > 5)
MAPI = (monetdb) /var/tmp/mtest-11592/.s.monetdb.39445
QUERY = SELECT t1.id1, t1.id2, t1.result, round(t2.expected, 80) as expected
FROM num_result t1, num_exp_div t2
WHERE t1.id1 = t2.id1 AND t1.id2 = t2.id2
AND t1.result <> round(t2.expected, 80);
-ERROR = !too many digits (19 > 7)
+ERROR = !too many digits (21 > 7)
MAPI = (monetdb) /var/tmp/mtest-11592/.s.monetdb.39445
QUERY = SELECT STDDEV(val) FROM num_data;
ERROR = !SELECT: no such unary operator 'stddev(decimal)'
diff --git
a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql
b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql
--- a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql
+++ b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql
@@ -18,9 +18,9 @@ SELECT * FROM sys._columns WHERE type NO
SELECT * FROM sys._columns WHERE type NOT IN (SELECT sqlname FROM sys.types);
SELECT * FROM sys.functions WHERE schema_id NOT IN (SELECT id FROM
sys.schemas);
--- SELECT * FROM sys.functions WHERE type NOT IN (SELECT id FROM
sys.function_types); -- table sys.function_types does not yet exist
+SELECT * FROM sys.functions WHERE type NOT IN (SELECT id FROM
sys.function_types); -- table sys.function_types added in default
SELECT * FROM sys.functions WHERE type NOT IN (1,2,3,4,5,6,7); -- replace
this check when table sys.function_types becomes available
--- SELECT * FROM sys.functions WHERE language NOT IN (SELECT language_id FROM
sys.function_languages); -- table sys.function_languages does not yet exist
+SELECT * FROM sys.functions WHERE language NOT IN (SELECT language_id FROM
sys.function_languages); -- table sys.function_languages added in default
SELECT * FROM sys.functions WHERE language NOT IN (0,1,2,3,4,5,6,7); --
replace this check when table sys.function_languages becomes available
SELECT * FROM sys.systemfunctions WHERE function_id NOT IN (SELECT id FROM
sys.functions);
@@ -36,16 +36,16 @@ SELECT * FROM sys.types WHERE schema_id
SELECT * FROM sys.keys WHERE table_id NOT IN (SELECT id FROM sys.tables);
SELECT * FROM sys.keys WHERE table_id NOT IN (SELECT id FROM sys._tables);
SELECT * FROM tmp.keys WHERE table_id NOT IN (SELECT id FROM tmp._tables);
--- SELECT * FROM sys.keys WHERE type NOT IN (SELECT key_type_id FROM
sys.key_types); -- table sys.key_types does not yet exist
--- SELECT * FROM tmp.keys WHERE type NOT IN (SELECT key_type_id FROM
sys.key_types); -- table sys.key_types does not yet exist
+SELECT * FROM sys.keys WHERE type NOT IN (SELECT key_type_id FROM
sys.key_types); -- table sys.key_types added in default
+SELECT * FROM tmp.keys WHERE type NOT IN (SELECT key_type_id FROM
sys.key_types); -- table sys.key_types added in default
SELECT * FROM sys.keys WHERE type NOT IN (0, 1, 2); -- replace this check
when table sys.key_types becomes available
SELECT * FROM tmp.keys WHERE type NOT IN (0, 1, 2); -- replace this check
when table sys.key_types becomes available
SELECT * FROM sys.idxs WHERE table_id NOT IN (SELECT id FROM sys.tables);
SELECT * FROM sys.idxs WHERE table_id NOT IN (SELECT id FROM sys._tables);
SELECT * FROM tmp.idxs WHERE table_id NOT IN (SELECT id FROM tmp._tables);
---SELECT * FROM sys.idxs WHERE type NOT IN (SELECT index_type_id FROM
sys.index_types); -- table sys.index_types does not yet exist
---SELECT * FROM tmp.idxs WHERE type NOT IN (SELECT index_type_id FROM
sys.index_types); -- table sys.index_types does not yet exist
+SELECT * FROM sys.idxs WHERE type NOT IN (SELECT index_type_id FROM
sys.index_types); -- table sys.index_types added in default
+SELECT * FROM tmp.idxs WHERE type NOT IN (SELECT index_type_id FROM
sys.index_types); -- table sys.index_types added in default
SELECT * FROM sys.idxs WHERE type NOT IN (0, 1, 2); -- replace this check
when table sys.index_types becomes available
SELECT * FROM tmp.idxs WHERE type NOT IN (0, 1, 2); -- replace this check
when table sys.index_types becomes available
@@ -88,14 +88,14 @@ SELECT * FROM sys.db_user_info WHERE def
SELECT * FROM sys.user_role WHERE role_id NOT IN (SELECT id FROM sys.auths);
SELECT * FROM sys.privileges WHERE auth_id NOT IN (SELECT id FROM sys.auths);
SELECT * FROM sys.privileges WHERE grantor NOT IN (SELECT id FROM sys.auths)
AND grantor > 0;
--- SELECT * FROM sys.privileges WHERE privileges NOT IN (SELECT
privilege_code_id FROM sys.privilege_codes); -- 1 and 16 -- table
sys.privilege_codes does not yet exist
+SELECT * FROM sys.privileges WHERE privileges NOT IN (SELECT privilege_code_id
FROM sys.privilege_codes); -- 1 and 16 -- table sys.privilege_codes added in
default
SELECT * FROM sys.privileges WHERE privileges NOT IN
(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,32); -- replace this check when table
sys.privilege_codes becomes available
SELECT * FROM sys.querylog_catalog WHERE owner NOT IN (SELECT name FROM
sys.users);
SELECT * FROM sys.querylog_calls WHERE id NOT IN (SELECT id FROM
sys.querylog_catalog);
SELECT * FROM sys.querylog_history WHERE id NOT IN (SELECT id FROM
sys.querylog_catalog);
-SELECT * FROM sys.queue WHERE tag NOT IN (SELECT qtag FROM sys.queue);
+SELECT * FROM sys.queue WHERE tag > 0 AND tag NOT IN (SELECT qtag FROM
sys.queue);
SELECT * FROM sys.queue WHERE "user" NOT IN (SELECT name FROM sys.users);
SELECT * FROM sys.sessions WHERE "user" NOT IN (SELECT name FROM sys.users);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
