thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 08:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Preserve timezone in arithmetic operations on DateTime

Browse Source
This commit is contained in:
Alexey Milovidov 2020-02-24 01:17:20 +03:00
parent 1b2fa6ee62
commit 66b1c1a87b
3 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
dbms/src/Functions/FunctionBinaryArithmetic.h
View File

@ -547,6 +547,13 @@ class FunctionBinaryArithmetic : public IFunction
FunctionOverloadResolverPtr getFunctionForIntervalArithmetic(const DataTypePtr & type0, const DataTypePtr & type1) const
{
bool first_is_date_or_datetime = isDateOrDateTime(type0);
bool second_is_date_or_datetime = isDateOrDateTime(type1);
/// Exactly one argument must be Date or DateTime
if (first_is_date_or_datetime == second_is_date_or_datetime)
return {};
/// Special case when the function is plus or minus, one of arguments is Date/DateTime and another is Interval.
/// We construct another function (example: addMonths) and call it.
@ -556,32 +563,39 @@ class FunctionBinaryArithmetic : public IFunction
if (!function_is_plus && !function_is_minus)
return {};
int interval_arg = 1;
const DataTypeInterval * interval_data_type = checkAndGetDataType<DataTypeInterval>(type1.get());
if (!interval_data_type)
{
interval_arg = 0;
interval_data_type = checkAndGetDataType<DataTypeInterval>(type0.get());
}
if (!interval_data_type)
return {};
const DataTypePtr & type_time = first_is_date_or_datetime ? type0 : type1;
const DataTypePtr & type_interval = first_is_date_or_datetime ? type1 : type0;
if (interval_arg == 0 && function_is_minus)
bool interval_is_number = isNumber(type_interval);
const DataTypeInterval * interval_data_type = nullptr;
if (!interval_is_number)
{
interval_data_type = checkAndGetDataType<DataTypeInterval>(type_interval.get());
if (!interval_data_type)
return {};
}
if (second_is_date_or_datetime && function_is_minus)
throw Exception("Wrong order of arguments for function " + getName() + ": argument of type Interval cannot be first.",
ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
const DataTypeDate * date_data_type = checkAndGetDataType<DataTypeDate>(interval_arg == 0 ? type1.get() : type0.get());
const DataTypeDateTime * date_time_data_type = nullptr;
if (!date_data_type)
std::string interval_name;
if (interval_data_type)
{
date_time_data_type = checkAndGetDataType<DataTypeDateTime>(interval_arg == 0 ? type1.get() : type0.get());
if (!date_time_data_type)
throw Exception("Wrong argument types for function " + getName() + ": if one argument is Interval, then another must be Date or DateTime.",
ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
interval_name = interval_data_type->getKind().toString();
}
else
{
if (isDate(type_time))
interval_name = "Day";
else
interval_name = "Second";
}
std::stringstream function_name;
function_name << (function_is_plus ? "add" : "subtract") << interval_data_type->getKind().toString() << 's';
function_name << (function_is_plus ? "add" : "subtract") << interval_name << 's';
return FunctionFactory::instance().get(function_name.str(), context);
}

1
dbms/tests/queries/0_stateless/01085_datetime_arithmetic_preserve_timezone.reference Normal file
View File

@ -0,0 +1 @@
2020-01-01 00:00:00 2020-01-01 00:00:01 2020-01-02 2020-01-01 00:00:01 2020-01-02 00:00:00 DateTime(\'UTC\') 2020-01-01 00:00:01.000 DateTime64(3, \'UTC\')

1
dbms/tests/queries/0_stateless/01085_datetime_arithmetic_preserve_timezone.sql Normal file
View File

@ -0,0 +1 @@
SELECT toDateTime('2020-01-01 00:00:00', 'UTC') AS t, t + 1, toDate(t) + 1, t + INTERVAL 1 SECOND, t + INTERVAL 1 DAY, toTypeName(t + 1), toDateTime64(t, 3, 'UTC') + 1 AS dt64, toTypeName(dt64);