From cd07d61ce7e38a9a913e0caa6c7f48f03a6c4996 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Tue, 2 Jun 2020 05:39:21 +0300 Subject: [PATCH] Updated tests --- .../Formats/Impl/PrettyBlockOutputFormat.cpp | 8 +- .../0_stateless/00098_k_union_all.reference | 24 +- .../00305_http_and_readonly.reference | 24 +- .../00405_pretty_formats.reference | 80 +++---- .../00476_pretty_formats_and_widths.reference | 22 +- ...0569_parse_date_time_best_effort.reference | 210 +++++++++--------- ...parse_date_time_best_effort_more.reference | 42 ++-- 7 files changed, 207 insertions(+), 203 deletions(-) diff --git a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp index 3a6b01a36ae..738bb316251 100644 --- a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp +++ b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp @@ -61,8 +61,12 @@ void PrettyBlockOutputFormat::calculateWidths( /// Note that it is just an estimation. 4 is the maximum size of Unicode code point in bytes in UTF-8. /// But it's possible that the string is long in bytes but very short in visible size. /// (e.g. non-printable characters, diacritics, combining characters) - if (serialized_value.size() > format_settings.pretty.max_value_width * 4) - serialized_value.resize(format_settings.pretty.max_value_width * 4); + if (format_settings.pretty.max_value_width) + { + size_t max_byte_size = format_settings.pretty.max_value_width * 4; + if (serialized_value.size() > max_byte_size) + serialized_value.resize(max_byte_size); + } widths[i][j] = UTF8::computeWidth(reinterpret_cast(serialized_value.data()), serialized_value.size(), prefix); max_padded_widths[i] = std::max(max_padded_widths[i], diff --git a/tests/queries/0_stateless/00098_k_union_all.reference b/tests/queries/0_stateless/00098_k_union_all.reference index 1b21a751afc..a6921e228af 100644 --- a/tests/queries/0_stateless/00098_k_union_all.reference +++ b/tests/queries/0_stateless/00098_k_union_all.reference @@ -1,18 +1,18 @@ -1 + 1 -1 -1 + 1 + 1 -1 -1 + 1 + 1 -1 -1 + 1 + 1 -1 -1 + 1 + 1 -1 -1 + 1 + 1 -1 + 1 diff --git a/tests/queries/0_stateless/00305_http_and_readonly.reference b/tests/queries/0_stateless/00305_http_and_readonly.reference index f148cbbb93b..4d0cb6bd6bc 100644 --- a/tests/queries/0_stateless/00305_http_and_readonly.reference +++ b/tests/queries/0_stateless/00305_http_and_readonly.reference @@ -1,19 +1,19 @@ -name value changed + name value changed -max_rows_to_read 10000 1 -readonly 0 0 -name value changed + max_rows_to_read 10000 1 + readonly 0 0 + name value changed -max_rows_to_read 10000 1 -readonly 2 1 -name value changed + max_rows_to_read 10000 1 + readonly 2 1 + name value changed -max_rows_to_read 10000 1 -readonly 1 1 -name value changed + max_rows_to_read 10000 1 + readonly 1 1 + name value changed -max_rows_to_read 10000 1 -readonly 2 1 + max_rows_to_read 10000 1 + readonly 2 1 Ok Ok 0 diff --git a/tests/queries/0_stateless/00405_pretty_formats.reference b/tests/queries/0_stateless/00405_pretty_formats.reference index 07dfd76339b..ef3184f2837 100644 --- a/tests/queries/0_stateless/00405_pretty_formats.reference +++ b/tests/queries/0_stateless/00405_pretty_formats.reference @@ -38,20 +38,20 @@ │ 8 │ 8 │ (8,'8') │ 2 │ │ 9 │ 9 │ (9,'9') │ ᴺᵁᴸᴸ │ └───────┴───────┴─────────┴─────────────────┘ -hello world tuple sometimes_nulls + hello world tuple sometimes_nulls - 0 0 (0,'0') ᴺᵁᴸᴸ - 1 1 (1,'1') 1 - 2 2 (2,'2') 2 - 3 3 (3,'3') ᴺᵁᴸᴸ - 4 4 (4,'4') 1 -hello world tuple sometimes_nulls + 0 0 (0,'0') ᴺᵁᴸᴸ + 1 1 (1,'1') 1 + 2 2 (2,'2') 2 + 3 3 (3,'3') ᴺᵁᴸᴸ + 4 4 (4,'4') 1 + hello world tuple sometimes_nulls - 5 5 (5,'5') 2 - 6 6 (6,'6') ᴺᵁᴸᴸ - 7 7 (7,'7') 1 - 8 8 (8,'8') 2 - 9 9 (9,'9') ᴺᵁᴸᴸ + 5 5 (5,'5') 2 + 6 6 (6,'6') ᴺᵁᴸᴸ + 7 7 (7,'7') 1 + 8 8 (8,'8') 2 + 9 9 (9,'9') ᴺᵁᴸᴸ ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─┐ │ 0 │ 0 │ (0,'0') │ ᴺᵁᴸᴸ │ │ 1 │ 1 │ (1,'1') │ 1 │ @@ -104,20 +104,20 @@ │ 8 │ 8 │ (8,'8') │ 2 │ │ 9 │ 9 │ (9,'9') │ ᴺᵁᴸᴸ │ └───────┴───────┴─────────┴─────────────────┘ -hello world tuple sometimes_nulls + hello world tuple sometimes_nulls - 0 0 (0,'0') ᴺᵁᴸᴸ - 1 1 (1,'1') 1 - 2 2 (2,'2') 2 - 3 3 (3,'3') ᴺᵁᴸᴸ - 4 4 (4,'4') 1 -hello world tuple sometimes_nulls + 0 0 (0,'0') ᴺᵁᴸᴸ + 1 1 (1,'1') 1 + 2 2 (2,'2') 2 + 3 3 (3,'3') ᴺᵁᴸᴸ + 4 4 (4,'4') 1 + hello world tuple sometimes_nulls - 5 5 (5,'5') 2 - 6 6 (6,'6') ᴺᵁᴸᴸ - 7 7 (7,'7') 1 - 8 8 (8,'8') 2 - 9 9 (9,'9') ᴺᵁᴸᴸ + 5 5 (5,'5') 2 + 6 6 (6,'6') ᴺᵁᴸᴸ + 7 7 (7,'7') 1 + 8 8 (8,'8') 2 + 9 9 (9,'9') ᴺᵁᴸᴸ ┏━━━━━━━┳━━━━━━━┳━━━━━━━━━┳━━━━━━━━━━━━━━━━━┓ ┃ hello ┃ world ┃ tuple  ┃ sometimes_nulls ┃ ┡━━━━━━━╇━━━━━━━╇━━━━━━━━━╇━━━━━━━━━━━━━━━━━┩ @@ -148,16 +148,16 @@ hello world tuple sometimes_nulls │ 5 │ 5 │ (5,'5') │ 2 │ └───────┴───────┴─────────┴─────────────────┘ Showed first 6. -hello world tuple sometimes_nulls + hello world tuple sometimes_nulls - 0 0 (0,'0') ᴺᵁᴸᴸ - 1 1 (1,'1') 1 - 2 2 (2,'2') 2 - 3 3 (3,'3') ᴺᵁᴸᴸ - 4 4 (4,'4') 1 -hello world tuple sometimes_nulls + 0 0 (0,'0') ᴺᵁᴸᴸ + 1 1 (1,'1') 1 + 2 2 (2,'2') 2 + 3 3 (3,'3') ᴺᵁᴸᴸ + 4 4 (4,'4') 1 + hello world tuple sometimes_nulls - 5 5 (5,'5') 2 + 5 5 (5,'5') 2 Showed first 6. ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─┐ @@ -199,15 +199,15 @@ Showed first 6. │ 5 │ 5 │ (5,'5') │ 2 │ └───────┴───────┴─────────┴─────────────────┘ Showed first 6. -hello world tuple sometimes_nulls + hello world tuple sometimes_nulls - 0 0 (0,'0') ᴺᵁᴸᴸ - 1 1 (1,'1') 1 - 2 2 (2,'2') 2 - 3 3 (3,'3') ᴺᵁᴸᴸ - 4 4 (4,'4') 1 -hello world tuple sometimes_nulls + 0 0 (0,'0') ᴺᵁᴸᴸ + 1 1 (1,'1') 1 + 2 2 (2,'2') 2 + 3 3 (3,'3') ᴺᵁᴸᴸ + 4 4 (4,'4') 1 + hello world tuple sometimes_nulls - 5 5 (5,'5') 2 + 5 5 (5,'5') 2 Showed first 6. diff --git a/tests/queries/0_stateless/00476_pretty_formats_and_widths.reference b/tests/queries/0_stateless/00476_pretty_formats_and_widths.reference index c97991ae0e9..eedaa4b5d8b 100644 --- a/tests/queries/0_stateless/00476_pretty_formats_and_widths.reference +++ b/tests/queries/0_stateless/00476_pretty_formats_and_widths.reference @@ -33,18 +33,18 @@ │ 100000000 │ 100000000 │ │ 1000000000 │ 1000000000 │ └────────────┴────────────┘ - x s + x s - 1 1 - 10 10 - 100 100 - 1000 1000 - 10000 10000 - 100000 100000 - 1000000 1000000 - 10000000 10000000 - 100000000 100000000 -1000000000 1000000000 + 1 1 + 10 10 + 100 100 + 1000 1000 + 10000 10000 + 100000 100000 + 1000000 1000000 + 10000000 10000000 + 100000000 100000000 + 1000000000 1000000000 ┌──────────x─┬─s──────────┐ │ 1 │ 1 │ │ 10 │ 10 │ diff --git a/tests/queries/0_stateless/00569_parse_date_time_best_effort.reference b/tests/queries/0_stateless/00569_parse_date_time_best_effort.reference index 8638c0b707f..b873e8b848d 100644 --- a/tests/queries/0_stateless/00569_parse_date_time_best_effort.reference +++ b/tests/queries/0_stateless/00569_parse_date_time_best_effort.reference @@ -1,106 +1,106 @@ -s a b + s a b -0 2000-01-01 00:00:00 2000-01-01 00:00:00 -0000 2000-01-01 00:00:00 2000-01-01 00:00:00 -00:00:00 2000-01-01 00:00:00 2000-01-01 00:00:00 -01:00:00 2000-01-01 01:00:00 2000-01-01 01:00:00 -02/01/17 010203 MSK 2017-01-01 22:02:03 2017-01-01 22:02:03 -02/01/17 010203 MSK+0100 2017-01-01 21:02:03 2017-01-01 21:02:03 -02/01/17 010203 UTC+0300 2017-01-01 22:02:03 2017-01-01 22:02:03 -02/01/17 010203Z 2017-01-02 01:02:03 2017-01-02 01:02:03 -02/01/1970 010203Z 1970-01-02 01:02:03 1970-01-02 01:02:03 -02/01/70 010203Z 1970-01-02 01:02:03 1970-01-02 01:02:03 -11 Feb 2018 06:40:50 +0300 2018-02-11 03:40:50 2018-02-11 03:40:50 -17 Apr 2 1:2:3 2000-04-17 01:02:03 2000-04-17 01:02:03 -19700102 01:00:00 1970-01-02 01:00:00 1970-01-02 01:00:00 -1970010201:00:00 2032-06-06 02:03:21 2032-06-06 02:03:21 -19700102010203 1970-01-02 01:02:03 1970-01-02 01:02:03 -19700102010203Z 1970-01-02 01:02:03 1970-01-02 01:02:03 -1970/01/02 010203Z 1970-01-02 01:02:03 1970-01-02 01:02:03 -20 2000-01-20 00:00:00 2000-01-20 00:00:00 -201 ᴺᵁᴸᴸ 0000-00-00 00:00:00 -20160101 2016-01-01 00:00:00 2016-01-01 00:00:00 -2016-01-01 2016-01-01 00:00:00 2016-01-01 00:00:00 -201601-01 2016-01-01 01:00:00 2016-01-01 01:00:00 -2016-01-01MSD 2015-12-31 20:00:00 2015-12-31 20:00:00 -2016-01-01 MSD 2015-12-31 20:00:00 2015-12-31 20:00:00 -201601-01 MSD 2016-01-01 04:00:00 2016-01-01 04:00:00 -2016-01-01UTC 2016-01-01 00:00:00 2016-01-01 00:00:00 -2016-01-01Z 2016-01-01 00:00:00 2016-01-01 00:00:00 -2017 2017-01-01 00:00:00 2017-01-01 00:00:00 -2017/01/00 2017-01-01 00:00:00 2017-01-01 00:00:00 -2017/01/00 MSD 2016-12-31 20:00:00 2016-12-31 20:00:00 -2017/01/00 MSD Jun 2017-05-31 20:00:00 2017-05-31 20:00:00 -2017/01/01 2017-01-01 00:00:00 2017-01-01 00:00:00 -201701 02 010203 UTC+0300 2017-01-01 22:02:03 2017-01-01 22:02:03 -2017-01-02 03:04:05 2017-01-02 03:04:05 2017-01-02 03:04:05 -2017-01-0203:04:05 ᴺᵁᴸᴸ 0000-00-00 00:00:00 -2017-01-02 03:04:05+0 2017-01-02 03:04:05 2017-01-02 03:04:05 -2017-01-02 03:04:05+00 2017-01-02 03:04:05 2017-01-02 03:04:05 -2017-01-02 03:04:05+0000 2017-01-02 03:04:05 2017-01-02 03:04:05 -2017-01-02 03:04:05 -0100 2017-01-02 04:04:05 2017-01-02 04:04:05 -2017-01-02 03:04:05+030 2017-01-02 02:34:05 2017-01-02 02:34:05 -2017-01-02 03:04:05+0300 2017-01-02 00:04:05 2017-01-02 00:04:05 -2017-01-02 03:04:05+1 2017-01-02 02:04:05 2017-01-02 02:04:05 -2017-01-02 03:04:05+300 2017-01-02 00:04:05 2017-01-02 00:04:05 -2017-01-02 03:04:05+900 2017-01-01 18:04:05 2017-01-01 18:04:05 -2017-01-02 03:04:05GMT 2017-01-02 03:04:05 2017-01-02 03:04:05 -2017-01-02 03:04:05 MSD 2017-01-01 23:04:05 2017-01-01 23:04:05 -2017-01-02 03:04:05 MSD Feb 2017-02-01 23:04:05 2017-02-01 23:04:05 -2017-01-02 03:04:05 MSD Jun 2017-06-01 23:04:05 2017-06-01 23:04:05 -2017-01-02 03:04:05 MSK 2017-01-02 00:04:05 2017-01-02 00:04:05 -2017-01-02T03:04:05 2017-01-02 03:04:05 2017-01-02 03:04:05 -2017-01-02T03:04:05+00 2017-01-02 03:04:05 2017-01-02 03:04:05 -2017-01-02T03:04:05 -0100 2017-01-02 04:04:05 2017-01-02 04:04:05 -2017-01-02T03:04:05-0100 2017-01-02 04:04:05 2017-01-02 04:04:05 -2017-01-02T03:04:05+0100 2017-01-02 02:04:05 2017-01-02 02:04:05 -2017-01-02T03:04:05Z 2017-01-02 03:04:05 2017-01-02 03:04:05 -2017-01 03:04:05 MSD Jun 2017-05-31 23:04:05 2017-05-31 23:04:05 -2017-01 03:04 MSD Jun 2017-05-31 23:04:00 2017-05-31 23:04:00 -2017/01/31 2017-01-31 00:00:00 2017-01-31 00:00:00 -2017/01/32 0000-00-00 00:00:00 0000-00-00 00:00:00 -2017-01 MSD Jun 2017-05-31 20:00:00 2017-05-31 20:00:00 -201701 MSD Jun 2017-05-31 20:00:00 2017-05-31 20:00:00 -2017 25 1:2:3 0000-00-00 00:00:00 0000-00-00 00:00:00 -2017 25 Apr 1:2:3 2017-04-01 01:02:03 2017-04-01 01:02:03 -2017 Apr 01 11:22:33 2017-04-01 11:22:33 2017-04-01 11:22:33 -2017 Apr 02 01/02/03 UTC+0300 ᴺᵁᴸᴸ 0000-00-00 00:00:00 -2017 Apr 02 010203 UTC+0300 2017-04-01 22:02:03 2017-04-01 22:02:03 -2017 Apr 02 01:2:3 UTC+0300 2017-04-01 22:02:03 2017-04-01 22:02:03 -2017 Apr 02 1:02:3 2017-04-02 01:02:03 2017-04-02 01:02:03 -2017 Apr 02 11:22:33 2017-04-02 11:22:33 2017-04-02 11:22:33 -2017 Apr 02 1:2:03 2017-04-02 01:02:03 2017-04-02 01:02:03 -2017 Apr 02 1:22:33 2017-04-02 01:22:33 2017-04-02 01:22:33 -2017 Apr 02 1:2:3 2017-04-02 01:02:03 2017-04-02 01:02:03 -2017 Apr 02 1:2:33 2017-04-02 01:02:33 2017-04-02 01:02:33 -2017 Apr 02 1:2:3 MSK 2017-04-01 22:02:03 2017-04-01 22:02:03 -2017 Apr 02 1:2:3 MSK 2017 2017-04-01 22:02:03 2017-04-01 22:02:03 -2017 Apr 02 1:2:3 MSK 2018 2017-04-01 22:02:03 2017-04-01 22:02:03 -2017 Apr 02 1:2:3 UTC+0000 2017-04-02 01:02:03 2017-04-02 01:02:03 -2017 Apr 02 1:2:3 UTC+0300 2017-04-01 22:02:03 2017-04-01 22:02:03 -2017 Apr 02 1:2:3 UTC+0400 2017-04-01 21:02:03 2017-04-01 21:02:03 -2017 Apr 2 1:2:3 2017-04-02 01:02:03 2017-04-02 01:02:03 -2017 Jan 02 010203 UTC+0300 2017-01-01 22:02:03 2017-01-01 22:02:03 -25 Apr 2017 01:02:03 2017-04-25 01:02:03 2017-04-25 01:02:03 -25 Apr 2017 1:2:3 2017-04-25 01:02:03 2017-04-25 01:02:03 -25 Jan 2017 1:2:3 2017-01-25 01:02:03 2017-01-25 01:02:03 -25 Jan 2017 1:2:3 MSK 2017-01-24 22:02:03 2017-01-24 22:02:03 -25 Jan 2017 1:2:3 PM 2017-01-25 13:02:03 2017-01-25 13:02:03 -25 Jan 2017 1:2:3Z 2017-01-25 01:02:03 2017-01-25 01:02:03 -25 Jan 2017 1:2:3 Z 2017-01-25 01:02:03 2017-01-25 01:02:03 -25 Jan 2017 1:2:3 Z +0300 2017-01-24 22:02:03 2017-01-24 22:02:03 -25 Jan 2017 1:2:3 Z+03:00 2017-01-24 22:02:03 2017-01-24 22:02:03 -25 Jan 2017 1:2:3 Z +0300 OM ᴺᵁᴸᴸ 0000-00-00 00:00:00 -25 Jan 2017 1:2:3 Z +03:00 PM 2017-01-25 10:02:03 2017-01-25 10:02:03 -25 Jan 2017 1:2:3 Z +0300 PM 2017-01-25 10:02:03 2017-01-25 10:02:03 -25 Jan 2017 1:2:3 Z+03:00 PM 2017-01-25 10:02:03 2017-01-25 10:02:03 -25 Jan 2017 1:2:3 Z +03:30 PM 2017-01-25 09:32:03 2017-01-25 09:32:03 -25 Jan 2017 1:2:3Z Mo ᴺᵁᴸᴸ 0000-00-00 00:00:00 -25 Jan 2017 1:2:3Z Mon 2017-01-25 01:02:03 2017-01-25 01:02:03 -25 Jan 2017 1:2:3Z Moo ᴺᵁᴸᴸ 0000-00-00 00:00:00 -25 Jan 2017 1:2:3 Z PM 2017-01-25 13:02:03 2017-01-25 13:02:03 -25 Jan 2017 1:2:3Z PM 2017-01-25 13:02:03 2017-01-25 13:02:03 -25 Jan 2017 1:2:3 Z PM +03:00 2017-01-25 10:02:03 2017-01-25 10:02:03 -Jun, 11 Feb 2018 06:40:50 +0300 2000-06-01 00:00:00 2000-06-01 00:00:00 -Sun 11 Feb 2018 06:40:50 +0300 2018-02-11 03:40:50 2018-02-11 03:40:50 -Sun, 11 Feb 2018 06:40:50 +0300 2018-02-11 03:40:50 2018-02-11 03:40:50 + 0 2000-01-01 00:00:00 2000-01-01 00:00:00 + 0000 2000-01-01 00:00:00 2000-01-01 00:00:00 + 00:00:00 2000-01-01 00:00:00 2000-01-01 00:00:00 + 01:00:00 2000-01-01 01:00:00 2000-01-01 01:00:00 + 02/01/17 010203 MSK 2017-01-01 22:02:03 2017-01-01 22:02:03 + 02/01/17 010203 MSK+0100 2017-01-01 21:02:03 2017-01-01 21:02:03 + 02/01/17 010203 UTC+0300 2017-01-01 22:02:03 2017-01-01 22:02:03 + 02/01/17 010203Z 2017-01-02 01:02:03 2017-01-02 01:02:03 + 02/01/1970 010203Z 1970-01-02 01:02:03 1970-01-02 01:02:03 + 02/01/70 010203Z 1970-01-02 01:02:03 1970-01-02 01:02:03 + 11 Feb 2018 06:40:50 +0300 2018-02-11 03:40:50 2018-02-11 03:40:50 + 17 Apr 2 1:2:3 2000-04-17 01:02:03 2000-04-17 01:02:03 + 19700102 01:00:00 1970-01-02 01:00:00 1970-01-02 01:00:00 + 1970010201:00:00 2032-06-06 02:03:21 2032-06-06 02:03:21 + 19700102010203 1970-01-02 01:02:03 1970-01-02 01:02:03 + 19700102010203Z 1970-01-02 01:02:03 1970-01-02 01:02:03 + 1970/01/02 010203Z 1970-01-02 01:02:03 1970-01-02 01:02:03 + 20 2000-01-20 00:00:00 2000-01-20 00:00:00 + 201 ᴺᵁᴸᴸ 0000-00-00 00:00:00 + 20160101 2016-01-01 00:00:00 2016-01-01 00:00:00 + 2016-01-01 2016-01-01 00:00:00 2016-01-01 00:00:00 + 201601-01 2016-01-01 01:00:00 2016-01-01 01:00:00 + 2016-01-01MSD 2015-12-31 20:00:00 2015-12-31 20:00:00 + 2016-01-01 MSD 2015-12-31 20:00:00 2015-12-31 20:00:00 + 201601-01 MSD 2016-01-01 04:00:00 2016-01-01 04:00:00 + 2016-01-01UTC 2016-01-01 00:00:00 2016-01-01 00:00:00 + 2016-01-01Z 2016-01-01 00:00:00 2016-01-01 00:00:00 + 2017 2017-01-01 00:00:00 2017-01-01 00:00:00 + 2017/01/00 2017-01-01 00:00:00 2017-01-01 00:00:00 + 2017/01/00 MSD 2016-12-31 20:00:00 2016-12-31 20:00:00 + 2017/01/00 MSD Jun 2017-05-31 20:00:00 2017-05-31 20:00:00 + 2017/01/01 2017-01-01 00:00:00 2017-01-01 00:00:00 + 201701 02 010203 UTC+0300 2017-01-01 22:02:03 2017-01-01 22:02:03 + 2017-01-02 03:04:05 2017-01-02 03:04:05 2017-01-02 03:04:05 + 2017-01-0203:04:05 ᴺᵁᴸᴸ 0000-00-00 00:00:00 + 2017-01-02 03:04:05+0 2017-01-02 03:04:05 2017-01-02 03:04:05 + 2017-01-02 03:04:05+00 2017-01-02 03:04:05 2017-01-02 03:04:05 + 2017-01-02 03:04:05+0000 2017-01-02 03:04:05 2017-01-02 03:04:05 + 2017-01-02 03:04:05 -0100 2017-01-02 04:04:05 2017-01-02 04:04:05 + 2017-01-02 03:04:05+030 2017-01-02 02:34:05 2017-01-02 02:34:05 + 2017-01-02 03:04:05+0300 2017-01-02 00:04:05 2017-01-02 00:04:05 + 2017-01-02 03:04:05+1 2017-01-02 02:04:05 2017-01-02 02:04:05 + 2017-01-02 03:04:05+300 2017-01-02 00:04:05 2017-01-02 00:04:05 + 2017-01-02 03:04:05+900 2017-01-01 18:04:05 2017-01-01 18:04:05 + 2017-01-02 03:04:05GMT 2017-01-02 03:04:05 2017-01-02 03:04:05 + 2017-01-02 03:04:05 MSD 2017-01-01 23:04:05 2017-01-01 23:04:05 + 2017-01-02 03:04:05 MSD Feb 2017-02-01 23:04:05 2017-02-01 23:04:05 + 2017-01-02 03:04:05 MSD Jun 2017-06-01 23:04:05 2017-06-01 23:04:05 + 2017-01-02 03:04:05 MSK 2017-01-02 00:04:05 2017-01-02 00:04:05 + 2017-01-02T03:04:05 2017-01-02 03:04:05 2017-01-02 03:04:05 + 2017-01-02T03:04:05+00 2017-01-02 03:04:05 2017-01-02 03:04:05 + 2017-01-02T03:04:05 -0100 2017-01-02 04:04:05 2017-01-02 04:04:05 + 2017-01-02T03:04:05-0100 2017-01-02 04:04:05 2017-01-02 04:04:05 + 2017-01-02T03:04:05+0100 2017-01-02 02:04:05 2017-01-02 02:04:05 + 2017-01-02T03:04:05Z 2017-01-02 03:04:05 2017-01-02 03:04:05 + 2017-01 03:04:05 MSD Jun 2017-05-31 23:04:05 2017-05-31 23:04:05 + 2017-01 03:04 MSD Jun 2017-05-31 23:04:00 2017-05-31 23:04:00 + 2017/01/31 2017-01-31 00:00:00 2017-01-31 00:00:00 + 2017/01/32 0000-00-00 00:00:00 0000-00-00 00:00:00 + 2017-01 MSD Jun 2017-05-31 20:00:00 2017-05-31 20:00:00 + 201701 MSD Jun 2017-05-31 20:00:00 2017-05-31 20:00:00 + 2017 25 1:2:3 0000-00-00 00:00:00 0000-00-00 00:00:00 + 2017 25 Apr 1:2:3 2017-04-01 01:02:03 2017-04-01 01:02:03 + 2017 Apr 01 11:22:33 2017-04-01 11:22:33 2017-04-01 11:22:33 + 2017 Apr 02 01/02/03 UTC+0300 ᴺᵁᴸᴸ 0000-00-00 00:00:00 + 2017 Apr 02 010203 UTC+0300 2017-04-01 22:02:03 2017-04-01 22:02:03 + 2017 Apr 02 01:2:3 UTC+0300 2017-04-01 22:02:03 2017-04-01 22:02:03 + 2017 Apr 02 1:02:3 2017-04-02 01:02:03 2017-04-02 01:02:03 + 2017 Apr 02 11:22:33 2017-04-02 11:22:33 2017-04-02 11:22:33 + 2017 Apr 02 1:2:03 2017-04-02 01:02:03 2017-04-02 01:02:03 + 2017 Apr 02 1:22:33 2017-04-02 01:22:33 2017-04-02 01:22:33 + 2017 Apr 02 1:2:3 2017-04-02 01:02:03 2017-04-02 01:02:03 + 2017 Apr 02 1:2:33 2017-04-02 01:02:33 2017-04-02 01:02:33 + 2017 Apr 02 1:2:3 MSK 2017-04-01 22:02:03 2017-04-01 22:02:03 + 2017 Apr 02 1:2:3 MSK 2017 2017-04-01 22:02:03 2017-04-01 22:02:03 + 2017 Apr 02 1:2:3 MSK 2018 2017-04-01 22:02:03 2017-04-01 22:02:03 + 2017 Apr 02 1:2:3 UTC+0000 2017-04-02 01:02:03 2017-04-02 01:02:03 + 2017 Apr 02 1:2:3 UTC+0300 2017-04-01 22:02:03 2017-04-01 22:02:03 + 2017 Apr 02 1:2:3 UTC+0400 2017-04-01 21:02:03 2017-04-01 21:02:03 + 2017 Apr 2 1:2:3 2017-04-02 01:02:03 2017-04-02 01:02:03 + 2017 Jan 02 010203 UTC+0300 2017-01-01 22:02:03 2017-01-01 22:02:03 + 25 Apr 2017 01:02:03 2017-04-25 01:02:03 2017-04-25 01:02:03 + 25 Apr 2017 1:2:3 2017-04-25 01:02:03 2017-04-25 01:02:03 + 25 Jan 2017 1:2:3 2017-01-25 01:02:03 2017-01-25 01:02:03 + 25 Jan 2017 1:2:3 MSK 2017-01-24 22:02:03 2017-01-24 22:02:03 + 25 Jan 2017 1:2:3 PM 2017-01-25 13:02:03 2017-01-25 13:02:03 + 25 Jan 2017 1:2:3Z 2017-01-25 01:02:03 2017-01-25 01:02:03 + 25 Jan 2017 1:2:3 Z 2017-01-25 01:02:03 2017-01-25 01:02:03 + 25 Jan 2017 1:2:3 Z +0300 2017-01-24 22:02:03 2017-01-24 22:02:03 + 25 Jan 2017 1:2:3 Z+03:00 2017-01-24 22:02:03 2017-01-24 22:02:03 + 25 Jan 2017 1:2:3 Z +0300 OM ᴺᵁᴸᴸ 0000-00-00 00:00:00 + 25 Jan 2017 1:2:3 Z +03:00 PM 2017-01-25 10:02:03 2017-01-25 10:02:03 + 25 Jan 2017 1:2:3 Z +0300 PM 2017-01-25 10:02:03 2017-01-25 10:02:03 + 25 Jan 2017 1:2:3 Z+03:00 PM 2017-01-25 10:02:03 2017-01-25 10:02:03 + 25 Jan 2017 1:2:3 Z +03:30 PM 2017-01-25 09:32:03 2017-01-25 09:32:03 + 25 Jan 2017 1:2:3Z Mo ᴺᵁᴸᴸ 0000-00-00 00:00:00 + 25 Jan 2017 1:2:3Z Mon 2017-01-25 01:02:03 2017-01-25 01:02:03 + 25 Jan 2017 1:2:3Z Moo ᴺᵁᴸᴸ 0000-00-00 00:00:00 + 25 Jan 2017 1:2:3 Z PM 2017-01-25 13:02:03 2017-01-25 13:02:03 + 25 Jan 2017 1:2:3Z PM 2017-01-25 13:02:03 2017-01-25 13:02:03 + 25 Jan 2017 1:2:3 Z PM +03:00 2017-01-25 10:02:03 2017-01-25 10:02:03 + Jun, 11 Feb 2018 06:40:50 +0300 2000-06-01 00:00:00 2000-06-01 00:00:00 + Sun 11 Feb 2018 06:40:50 +0300 2018-02-11 03:40:50 2018-02-11 03:40:50 + Sun, 11 Feb 2018 06:40:50 +0300 2018-02-11 03:40:50 2018-02-11 03:40:50 diff --git a/tests/queries/0_stateless/00813_parse_date_time_best_effort_more.reference b/tests/queries/0_stateless/00813_parse_date_time_best_effort_more.reference index 921400838d0..3acae55e846 100644 --- a/tests/queries/0_stateless/00813_parse_date_time_best_effort_more.reference +++ b/tests/queries/0_stateless/00813_parse_date_time_best_effort_more.reference @@ -1,22 +1,22 @@ -s a b + s a b -24.12.2018 2018-12-24 00:00:00 2018-12-24 00:00:00 -24-12-2018 2018-12-24 00:00:00 2018-12-24 00:00:00 -24.12.18 2018-12-24 00:00:00 2018-12-24 00:00:00 -24-12-18 2018-12-24 00:00:00 2018-12-24 00:00:00 -24-Dec-18 2018-12-24 00:00:00 2018-12-24 00:00:00 -24/DEC/18 2018-12-24 00:00:00 2018-12-24 00:00:00 -24/DEC/2018 2018-12-24 00:00:00 2018-12-24 00:00:00 -01-OCT-2015 2015-10-01 00:00:00 2015-10-01 00:00:00 -24.12.2018 2018-12-24 00:00:00 2018-12-24 00:00:00 -24-12-2018 2018-12-24 00:00:00 2018-12-24 00:00:00 -24.12.18 2018-12-24 00:00:00 2018-12-24 00:00:00 -24-12-18 2018-12-24 00:00:00 2018-12-24 00:00:00 -24-Dec-18 2018-12-24 00:00:00 2018-12-24 00:00:00 -24/DEC/18 2018-12-24 00:00:00 2018-12-24 00:00:00 -24/DEC/2018 2018-12-24 00:00:00 2018-12-24 00:00:00 -01-OCT-2015 2015-10-01 00:00:00 2015-10-01 00:00:00 -24.12.18 010203 2018-12-24 01:02:03 2018-12-24 01:02:03 -24.12.18 01:02:03 2018-12-24 01:02:03 2018-12-24 01:02:03 -24.DEC.18T01:02:03.000+0300 2018-12-23 22:02:03 2018-12-23 22:02:03 -01-September-2018 11:22 2018-09-01 11:22:00 2018-09-01 11:22:00 + 24.12.2018 2018-12-24 00:00:00 2018-12-24 00:00:00 + 24-12-2018 2018-12-24 00:00:00 2018-12-24 00:00:00 + 24.12.18 2018-12-24 00:00:00 2018-12-24 00:00:00 + 24-12-18 2018-12-24 00:00:00 2018-12-24 00:00:00 + 24-Dec-18 2018-12-24 00:00:00 2018-12-24 00:00:00 + 24/DEC/18 2018-12-24 00:00:00 2018-12-24 00:00:00 + 24/DEC/2018 2018-12-24 00:00:00 2018-12-24 00:00:00 + 01-OCT-2015 2015-10-01 00:00:00 2015-10-01 00:00:00 + 24.12.2018 2018-12-24 00:00:00 2018-12-24 00:00:00 + 24-12-2018 2018-12-24 00:00:00 2018-12-24 00:00:00 + 24.12.18 2018-12-24 00:00:00 2018-12-24 00:00:00 + 24-12-18 2018-12-24 00:00:00 2018-12-24 00:00:00 + 24-Dec-18 2018-12-24 00:00:00 2018-12-24 00:00:00 + 24/DEC/18 2018-12-24 00:00:00 2018-12-24 00:00:00 + 24/DEC/2018 2018-12-24 00:00:00 2018-12-24 00:00:00 + 01-OCT-2015 2015-10-01 00:00:00 2015-10-01 00:00:00 + 24.12.18 010203 2018-12-24 01:02:03 2018-12-24 01:02:03 + 24.12.18 01:02:03 2018-12-24 01:02:03 2018-12-24 01:02:03 + 24.DEC.18T01:02:03.000+0300 2018-12-23 22:02:03 2018-12-23 22:02:03 + 01-September-2018 11:22 2018-09-01 11:22:00 2018-09-01 11:22:00