Skip to content

Commit

Permalink
Issue duckdb#12287: ICU Strptime Lists
Browse files Browse the repository at this point in the history 
Default to TS not TSTZ when binding multiple formats.

fixes: duckdb#12287
fixes: duckdblabs/duckdb-internal#2153
  • Loading branch information
Richard Wesley committed May 28, 2024
1 parent 4834a0b commit b5903f3
Show file tree
Hide file tree
Showing 2 changed files with 93 additions and 3 deletions.
6 changes: 3 additions & 3 deletions extension/icu/icu-strptime.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ struct ICUStrptime : public ICUDateFunc {
}
}

static bind_scalar_function_t bind_strptime;
static bind_scalar_function_t bind_strptime; // NOLINT

static duckdb::unique_ptr<FunctionData> StrpTimeBindFunction(ClientContext &context, ScalarFunction &bound_function,
vector<duckdb::unique_ptr<Expression>> &arguments) {
Expand Down Expand Up @@ -194,7 +194,7 @@ struct ICUStrptime : public ICUDateFunc {
throw InvalidInputException("strptime format list must not be empty");
}
vector<StrpTimeFormat> formats;
bool has_tz = true;
bool has_tz = false;
for (const auto &child : children) {
format_string = child.ToString();
format.format_specifier = format_string;
Expand Down Expand Up @@ -341,7 +341,7 @@ struct ICUStrptime : public ICUDateFunc {
}
};

bind_scalar_function_t ICUStrptime::bind_strptime = nullptr;
bind_scalar_function_t ICUStrptime::bind_strptime = nullptr; // NOLINT

struct ICUStrftime : public ICUDateFunc {
static void ParseFormatSpecifier(string_t &format_str, StrfTimeFormat &format) {
Expand Down
90 changes: 90 additions & 0 deletions test/sql/function/timestamp/test_icu_strptime.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,96 @@ ORDER BY ALL
2022-03-05 20:59:17.877-08 Pacific/Niue
2022-03-05 21:59:17.877-08 Etc/GMT+12

# First has no TZ
query II
SELECT ${func}('2022-03-05 17:59:17.877 ' || tz_name, ['%Y-%m-%d %H:%M:%S.%g', '%Y-%m-%d %H:%M:%S.%g %Z']) tstz, tz_name
FROM zones
ORDER BY ALL
----
2022-03-04 19:59:17.877-08 Etc/GMT-14
2022-03-04 20:14:17.877-08 NZ-CHAT
2022-03-04 20:59:17.877-08 Pacific/Auckland
2022-03-04 20:59:17.877-08 Pacific/Enderbury
2022-03-04 22:59:17.877-08 Australia/LHI
2022-03-04 22:59:17.877-08 Australia/Melbourne
2022-03-04 22:59:17.877-08 Pacific/Efate
2022-03-05 00:29:17.877-08 Australia/Darwin
2022-03-05 00:59:17.877-08 Asia/Tokyo
2022-03-05 01:14:17.877-08 Australia/Eucla
2022-03-05 01:59:17.877-08 Asia/Shanghai
2022-03-05 02:59:17.877-08 Asia/Novosibirsk
2022-03-05 03:29:17.877-08 Asia/Yangon
2022-03-05 03:59:17.877-08 Asia/Omsk
2022-03-05 04:14:17.877-08 Asia/Kathmandu
2022-03-05 04:29:17.877-08 Asia/Colombo
2022-03-05 04:59:17.877-08 Asia/Oral
2022-03-05 05:29:17.877-08 Asia/Kabul
2022-03-05 05:59:17.877-08 Europe/Astrakhan
2022-03-05 06:29:17.877-08 Asia/Tehran
2022-03-05 06:59:17.877-08 Asia/Kuwait
2022-03-05 07:59:17.877-08 Asia/Nicosia
2022-03-05 08:59:17.877-08 Europe/Budapest
2022-03-05 09:59:17.877-08 Etc/GMT-0
2022-03-05 10:59:17.877-08 Atlantic/Azores
2022-03-05 12:59:17.877-08 America/Cayenne
2022-03-05 12:59:17.877-08 America/Nuuk
2022-03-05 13:29:17.877-08 CNT
2022-03-05 13:59:17.877-08 America/Martinique
2022-03-05 14:59:17.877-08 America/Louisville
2022-03-05 15:59:17.877-08 America/Rainy_River
2022-03-05 16:59:17.877-08 America/Shiprock
2022-03-05 17:59:17.877-08 Mexico/BajaNorte
2022-03-05 18:59:17.877-08 America/Sitka
2022-03-05 19:29:17.877-08 Pacific/Marquesas
2022-03-05 19:59:17.877-08 Pacific/Johnston
2022-03-05 20:59:17.877-08 Pacific/Niue
2022-03-05 21:59:17.877-08 Etc/GMT+12

# Neither has TZ - should be TS not TSTZ
query II
SELECT ${func}('2022-03-05 17:59:17.877', ['%m/%d/%Y %H:%M:%S.%g', '%Y-%m-%d %H:%M:%S.%g']) tstz, tz_name
FROM zones
ORDER BY ALL
----
2022-03-05 17:59:17.877 America/Cayenne
2022-03-05 17:59:17.877 America/Louisville
2022-03-05 17:59:17.877 America/Martinique
2022-03-05 17:59:17.877 America/Nuuk
2022-03-05 17:59:17.877 America/Rainy_River
2022-03-05 17:59:17.877 America/Shiprock
2022-03-05 17:59:17.877 America/Sitka
2022-03-05 17:59:17.877 Asia/Colombo
2022-03-05 17:59:17.877 Asia/Kabul
2022-03-05 17:59:17.877 Asia/Kathmandu
2022-03-05 17:59:17.877 Asia/Kuwait
2022-03-05 17:59:17.877 Asia/Nicosia
2022-03-05 17:59:17.877 Asia/Novosibirsk
2022-03-05 17:59:17.877 Asia/Omsk
2022-03-05 17:59:17.877 Asia/Oral
2022-03-05 17:59:17.877 Asia/Shanghai
2022-03-05 17:59:17.877 Asia/Tehran
2022-03-05 17:59:17.877 Asia/Tokyo
2022-03-05 17:59:17.877 Asia/Yangon
2022-03-05 17:59:17.877 Atlantic/Azores
2022-03-05 17:59:17.877 Australia/Darwin
2022-03-05 17:59:17.877 Australia/Eucla
2022-03-05 17:59:17.877 Australia/LHI
2022-03-05 17:59:17.877 Australia/Melbourne
2022-03-05 17:59:17.877 CNT
2022-03-05 17:59:17.877 Etc/GMT+12
2022-03-05 17:59:17.877 Etc/GMT-0
2022-03-05 17:59:17.877 Etc/GMT-14
2022-03-05 17:59:17.877 Europe/Astrakhan
2022-03-05 17:59:17.877 Europe/Budapest
2022-03-05 17:59:17.877 Mexico/BajaNorte
2022-03-05 17:59:17.877 NZ-CHAT
2022-03-05 17:59:17.877 Pacific/Auckland
2022-03-05 17:59:17.877 Pacific/Efate
2022-03-05 17:59:17.877 Pacific/Enderbury
2022-03-05 17:59:17.877 Pacific/Johnston
2022-03-05 17:59:17.877 Pacific/Marquesas
2022-03-05 17:59:17.877 Pacific/Niue

endloop

#
Expand Down

0 comments on commit b5903f3

Please sign in to comment.