From 91ca58d0d3b0ba8186fac52e2020f5964641c56f Mon Sep 17 00:00:00 2001 From: Alexey Arno Date: Thu, 2 Jul 2015 17:22:15 +0300 Subject: [PATCH] dbms: Server: Support for multiple time zones: development [#METR-15618] --- .../queries/0_stateless/00189_time_zones.reference | 14 +++++++------- .../tests/queries/0_stateless/00189_time_zones.sql | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dbms/tests/queries/0_stateless/00189_time_zones.reference b/dbms/tests/queries/0_stateless/00189_time_zones.reference index 02ad1862f2f..78c2c72ac55 100644 --- a/dbms/tests/queries/0_stateless/00189_time_zones.reference +++ b/dbms/tests/queries/0_stateless/00189_time_zones.reference @@ -23,21 +23,21 @@ 1970-01-02 09:00:00 1970-01-02 10:00:00 1970-01-02 18:00:00 1970-01-02 18:00:00 1970-01-02 01:30:00 1970-01-02 01:30:00 -2014-12-29 2015-01-01 2015-01-01 1970-01-02 12:00:00 2014-09-29 2014-09-01 2014-07-01 1970-01-02 21:50:00 -2015-07-13 2015-07-01 2015-07-01 1970-01-02 19:30:00 2014-12-22 2014-12-01 2014-10-01 1970-01-02 21:00:00 +2014-12-29 2015-01-01 2015-01-01 1970-01-02 12:00:00 2015-03-09 2015-03-01 2015-01-01 1970-01-02 02:00:00 -2014-12-29 2015-01-01 2015-01-01 1970-01-02 01:30:00 -2014-12-22 2014-12-01 2014-10-01 1970-01-02 13:30:00 +2015-07-13 2015-07-01 2015-07-01 1970-01-02 19:30:00 2014-09-29 2014-09-01 2014-10-01 1970-01-02 11:20:00 -2015-07-13 2015-07-01 2015-07-01 1970-01-02 02:00:00 +2014-12-22 2014-12-01 2014-10-01 1970-01-02 13:30:00 +2014-12-29 2015-01-01 2015-01-01 1970-01-02 01:30:00 2015-03-09 2015-03-01 2015-01-01 1970-01-02 02:00:00 -2015-03-09 2015-03-01 2015-01-01 1970-01-02 13:30:00 +2015-07-13 2015-07-01 2015-07-01 1970-01-02 02:00:00 2015-03-09 2015-03-01 2015-01-01 1970-01-02 11:30:00 2015-03-09 2015-03-01 2015-01-01 1970-01-02 10:30:00 -2015-03-09 2015-03-01 2015-01-01 1970-01-02 19:30:00 +2015-03-09 2015-03-01 2015-01-01 1970-01-02 13:30:00 2015-03-09 2015-03-01 2015-01-01 1970-01-02 02:00:00 +2015-03-09 2015-03-01 2015-01-01 1970-01-02 19:30:00 2015-07-15 13:30:00 2015-07-15 12:30:00 2015-07-15 11:30:00 diff --git a/dbms/tests/queries/0_stateless/00189_time_zones.sql b/dbms/tests/queries/0_stateless/00189_time_zones.sql index 90e2d4e2027..4dc7cec6324 100644 --- a/dbms/tests/queries/0_stateless/00189_time_zones.sql +++ b/dbms/tests/queries/0_stateless/00189_time_zones.sql @@ -54,9 +54,9 @@ INSERT INTO foo(x, y) VALUES(1419800400, 'Europe/London'); INSERT INTO foo(x, y) VALUES(1436956200, 'Asia/Tokyo'); INSERT INTO foo(x, y) VALUES(1426415400, 'Pacific/Pitcairn'); -SELECT toMonday(toDateTime(x), y), toStartOfMonth(toDateTime(x), y), toStartOfQuarter(toDateTime(x), y), toTime(toDateTime(x), y) FROM foo; -SELECT toMonday(toDateTime(x), 'Europe/Paris'), toStartOfMonth(toDateTime(x), 'Europe/London'), toStartOfQuarter(toDateTime(x), 'Asia/Tokyo'), toTime(toDateTime(x), 'Pacific/Pitcairn') FROM foo; -SELECT toMonday(toDateTime(1426415400), y), toStartOfMonth(toDateTime(1426415400), y), toStartOfQuarter(toDateTime(1426415400), y), toTime(toDateTime(1426415400), y) FROM foo; +SELECT toMonday(toDateTime(x), y), toStartOfMonth(toDateTime(x), y), toStartOfQuarter(toDateTime(x), y), toTime(toDateTime(x), y) FROM foo ORDER BY x ASC; +SELECT toMonday(toDateTime(x), 'Europe/Paris'), toStartOfMonth(toDateTime(x), 'Europe/London'), toStartOfQuarter(toDateTime(x), 'Asia/Tokyo'), toTime(toDateTime(x), 'Pacific/Pitcairn') FROM foo ORDER BY x ASC; +SELECT toMonday(toDateTime(1426415400), y), toStartOfMonth(toDateTime(1426415400), y), toStartOfQuarter(toDateTime(1426415400), y), toTime(toDateTime(1426415400), y) FROM foo ORDER BY x ASC; /* toString */