Changeset: f425712a7121 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f425712a7121 Branch: mtest Log Message:
merged diffs (238 lines): diff --git a/sql/test/BugDay_2005-11-09_2.9.3/Tests/date_functions.SF-967145.test b/sql/test/BugDay_2005-11-09_2.9.3/Tests/date_functions.SF-967145.test --- a/sql/test/BugDay_2005-11-09_2.9.3/Tests/date_functions.SF-967145.test +++ b/sql/test/BugDay_2005-11-09_2.9.3/Tests/date_functions.SF-967145.test @@ -1,7 +1,9 @@ -statement error +query T select current_date - current_date +---- +1 day -statement error +query T select current_date() - current_date() - - +---- +1 day diff --git a/sql/test/BugTracker-2015/Tests/sum_interval.Bug-3785.test b/sql/test/BugTracker-2015/Tests/sum_interval.Bug-3785.test --- a/sql/test/BugTracker-2015/Tests/sum_interval.Bug-3785.test +++ b/sql/test/BugTracker-2015/Tests/sum_interval.Bug-3785.test @@ -12,7 +12,8 @@ 366 days, 0:00:00 statement ok drop table foo -statement error +query T select sum(i) from (select interval '1' day) x(i) +---- +1 day - diff --git a/sql/test/BugTracker-2016/Tests/date_calculation_and_comparison_wrong_results.Bug-3940.test b/sql/test/BugTracker-2016/Tests/date_calculation_and_comparison_wrong_results.Bug-3940.test --- a/sql/test/BugTracker-2016/Tests/date_calculation_and_comparison_wrong_results.Bug-3940.test +++ b/sql/test/BugTracker-2016/Tests/date_calculation_and_comparison_wrong_results.Bug-3940.test @@ -10,8 +10,15 @@ INSERT INTO foo VALUES ('2016-01-01', '2 statement ok INSERT INTO foo VALUES ('2016-01-01', '2016-01-31') -statement error +query TT SELECT (dat2-dat1), (dat2-dat1) < interval '10' day FROM foo +---- +1 day +True +00:00:00 +True +1 day +False statement ok DROP TABLE foo diff --git a/sql/test/BugTracker-2017/Tests/date-arithmetic.Bug-6415.test b/sql/test/BugTracker-2017/Tests/date-arithmetic.Bug-6415.test --- a/sql/test/BugTracker-2017/Tests/date-arithmetic.Bug-6415.test +++ b/sql/test/BugTracker-2017/Tests/date-arithmetic.Bug-6415.test @@ -1,5 +1,8 @@ -statement error +query TT select cast('2017-10-10' as date) - cast('2017-10-01' as date), date '2017-10-10' - date '2017-10-01' +---- +1 day +1 day query TT rowsort select cast('2017-10-01' as date) + interval '9' day, date '2017-10-01' + interval '9' day diff --git a/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test b/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test --- a/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test +++ b/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test @@ -158,8 +158,10 @@ SELECT INTERVAL '5' SECOND / cast(1.0 as ---- 0:00:05 -statement error +query T rowsort SELECT INTERVAL '-100' DAY / cast(23.34 as real) +---- +1 day query T rowsort SELECT INTERVAL '32' MINUTE / cast(45.5677 as real) diff --git a/sql/test/orderidx/Tests/imprints_all_types.test b/sql/test/orderidx/Tests/imprints_all_types.test --- a/sql/test/orderidx/Tests/imprints_all_types.test +++ b/sql/test/orderidx/Tests/imprints_all_types.test @@ -92,14 +92,18 @@ insert into all_types values (false, -10 'https://www.monetdb.org/Documentation/Manuals/SQLreference/URLtype', '76236890-f4e2-4d4f-a02b-ec7a02c3cb50') -statement error +query I select * from all_types +---- +1 statement ok insert into all_types select * from all_types -statement error +query I select * from all_types +---- +1 query TIITIIT rowsort select name, schema_id, type, system, commit_action, access, query from sys._tables where name = 'all_types' @@ -400,8 +404,10 @@ select "iM" from all_types order by "iM" 3 3 -statement error +query I select "id" from all_types order by "id" ASC +---- +1 query T rowsort select "idh" from all_types order by "idh" ASC @@ -787,8 +793,10 @@ select "iM" from all_types order by "iM" 3 3 -statement error +query I select "id" from all_types order by "id" DESC +---- +1 query T rowsort select "idh" from all_types order by "idh" DESC @@ -1041,8 +1049,10 @@ ae106ad4-81fd-4f1a-85e8-5efface60da4 statement ok insert into all_types select * from all_types -statement error +query I select * from all_types order by 11,12,13,14,15,16,17,18,19,20,1,2,3,4,5,6,7,8,9,10 +---- +1 query IT rowsort select type, name from sys.idxs where table_id in (select id from sys._tables where name = 'all_types') order by name diff --git a/sql/test/orderidx/Tests/oidx_all_types.test b/sql/test/orderidx/Tests/oidx_all_types.test --- a/sql/test/orderidx/Tests/oidx_all_types.test +++ b/sql/test/orderidx/Tests/oidx_all_types.test @@ -95,14 +95,18 @@ insert into all_types values (false, -10 'https://www.monetdb.org/Documentation/Manuals/SQLreference/URLtype', '76236890-f4e2-4d4f-a02b-ec7a02c3cb50') -statement error +query I select * from all_types +---- +1 statement ok insert into all_types select * from all_types -statement error +query I select * from all_types +---- +1 query TIITIIT rowsort select name, schema_id, type, system, commit_action, access, query from sys._tables where name = 'all_types' @@ -413,8 +417,10 @@ select "iM" from all_types order by "iM" 3 3 -statement error +query I select "id" from all_types order by "id" ASC +---- +1 query T rowsort select "idh" from all_types order by "idh" ASC @@ -805,8 +811,10 @@ select "iM" from all_types order by "iM" 3 3 -statement error +query I select "id" from all_types order by "id" DESC +---- +1 query T rowsort select "idh" from all_types order by "idh" DESC @@ -1059,8 +1067,10 @@ ae106ad4-81fd-4f1a-85e8-5efface60da4 statement ok insert into all_types select * from all_types -statement error +query I select * from all_types order by 11,12,13,14,15,16,17,18,19,20,1,2,3,4,5,6,7,8,9,10 +---- +1 query IT rowsort select type, name from sys.idxs where table_id in (select id from sys._tables where name = 'all_types') order by name diff --git a/sql/test/pg_regress/Tests/date.test b/sql/test/pg_regress/Tests/date.test --- a/sql/test/pg_regress/Tests/date.test +++ b/sql/test/pg_regress/Tests/date.test @@ -275,14 +275,17 @@ SELECT f1, sql_sub(f1, cast(12 as interv statement error SELECT f1, sql_sub(f1, cast(-18 as interval month)) FROM DATE_TBL -statement error +query T rowsort SELECT f1, sql_sub(f1, cast('2001-12-12' as date)) FROM DATE_TBL - -statement error -SELECT f1, sql_sub(cast('2001-12-12' as date), f1) FROM DATE_TBL +---- +32 values hashing to 418df9efc27b77e5b5c1877834dd6fb8 query T rowsort - +SELECT f1, sql_sub(cast('2001-12-12' as date), f1) FROM DATE_TBL +---- +32 values hashing to 418df9efc27b77e5b5c1877834dd6fb8 + +query T rowsort SELECT date 'January 8, 1999' ---- 1999-01-08 @@ -740,9 +743,10 @@ SELECT date '1999 08 01' ---- 1999-08-01 -statement error - +query T rowsort SELECT f1 - date '2000-01-01' AS "Days From 2K" FROM DATE_TBL +---- +16 values hashing to 418df9efc27b77e5b5c1877834dd6fb8 statement error SELECT f1 - date 'epoch' AS "Days From Epoch" FROM DATE_TBL _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list