From 6debaccd85c34a7e777f5bd9241abf4e09490540 Mon Sep 17 00:00:00 2001
From: Nikolay Degterinsky <evillique@gmail.com>
Date: Sun, 9 Apr 2023 11:12:08 +0000
Subject: [PATCH] Fix build

---
 src/DataTypes/DataTypeDateTime64.cpp     |  4 +--
 src/DataTypes/DataTypeDateTime64.h       |  2 +-
 src/Functions/array/arrayAggregation.cpp | 44 +++++++++++++-----------
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/DataTypes/DataTypeDateTime64.cpp b/src/DataTypes/DataTypeDateTime64.cpp
index 248eb3638b9..124fea1f458 100644
--- a/src/DataTypes/DataTypeDateTime64.cpp
+++ b/src/DataTypes/DataTypeDateTime64.cpp
@@ -57,14 +57,14 @@ SerializationPtr DataTypeDateTime64::doGetDefaultSerialization() const
     return std::make_shared<SerializationDateTime64>(scale, *this);
 }
 
-inline std::string getDateTimeTimezone(const IDataType & data_type)
+std::string getDateTimeTimezone(const IDataType & data_type)
 {
     if (const auto * type = typeid_cast<const DataTypeDateTime *>(&data_type))
         return type->hasExplicitTimeZone() ? type->getTimeZone().getTimeZone() : std::string();
     if (const auto * type = typeid_cast<const DataTypeDateTime64 *>(&data_type))
         return type->hasExplicitTimeZone() ? type->getTimeZone().getTimeZone() : std::string();
 
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot get decimal scale from type {}", data_type.getName());
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot get time zone from type {}", data_type.getName());
 }
 
 }
diff --git a/src/DataTypes/DataTypeDateTime64.h b/src/DataTypes/DataTypeDateTime64.h
index 64547b30be9..aaa99485040 100644
--- a/src/DataTypes/DataTypeDateTime64.h
+++ b/src/DataTypes/DataTypeDateTime64.h
@@ -41,7 +41,7 @@ protected:
     SerializationPtr doGetDefaultSerialization() const override;
 };
 
-inline std::string getDateTimeTimezone(const IDataType & data_type);
+std::string getDateTimeTimezone(const IDataType & data_type);
 
 }
 
diff --git a/src/Functions/array/arrayAggregation.cpp b/src/Functions/array/arrayAggregation.cpp
index 1fe02870e4d..e13b5b1d2f1 100644
--- a/src/Functions/array/arrayAggregation.cpp
+++ b/src/Functions/array/arrayAggregation.cpp
@@ -84,9 +84,10 @@ struct ArrayAggregateResultImpl<ArrayElement, AggregateOperation::sum>
         std::conditional_t<std::is_same_v<ArrayElement, Decimal64>, Decimal128,
         std::conditional_t<std::is_same_v<ArrayElement, Decimal128>, Decimal128,
         std::conditional_t<std::is_same_v<ArrayElement, Decimal256>, Decimal256,
+        std::conditional_t<std::is_same_v<ArrayElement, DateTime64>, Decimal128,
         std::conditional_t<std::is_floating_point_v<ArrayElement>, Float64,
         std::conditional_t<std::is_signed_v<ArrayElement>, Int64,
-            UInt64>>>>>>>>>>;
+            UInt64>>>>>>>>>>>;
 };
 
 template <typename ArrayElement, AggregateOperation operation>
@@ -111,28 +112,31 @@ struct ArrayAggregateImpl
             using Types = std::decay_t<decltype(types)>;
             using DataType = typename Types::LeftType;
 
-            if constexpr (aggregate_operation == AggregateOperation::average || aggregate_operation == AggregateOperation::product)
+            if constexpr (!IsDataTypeDateOrDateTime<DataType>)
             {
-                result = std::make_shared<DataTypeFloat64>();
+                if constexpr (aggregate_operation == AggregateOperation::average || aggregate_operation == AggregateOperation::product)
+                {
+                    result = std::make_shared<DataTypeFloat64>();
 
-                return true;
-            }
-            else if constexpr (IsDataTypeNumber<DataType>)
-            {
-                using NumberReturnType = ArrayAggregateResult<typename DataType::FieldType, aggregate_operation>;
-                result = std::make_shared<DataTypeNumber<NumberReturnType>>();
+                    return true;
+                }
+                else if constexpr (IsDataTypeNumber<DataType>)
+                {
+                    using NumberReturnType = ArrayAggregateResult<typename DataType::FieldType, aggregate_operation>;
+                    result = std::make_shared<DataTypeNumber<NumberReturnType>>();
 
-                return true;
-            }
-            else if constexpr (IsDataTypeDecimal<DataType> && !IsDataTypeDateOrDateTime<DataType>)
-            {
-                using DecimalReturnType = ArrayAggregateResult<typename DataType::FieldType, aggregate_operation>;
-                UInt32 scale = getDecimalScale(*expression_return);
-                result = std::make_shared<DataTypeDecimal<DecimalReturnType>>(DecimalUtils::max_precision<DecimalReturnType>, scale);
+                    return true;
+                }
+                else if constexpr (IsDataTypeDecimal<DataType>)
+                {
+                    using DecimalReturnType = ArrayAggregateResult<typename DataType::FieldType, aggregate_operation>;
+                    UInt32 scale = getDecimalScale(*expression_return);
+                    result = std::make_shared<DataTypeDecimal<DecimalReturnType>>(DecimalUtils::max_precision<DecimalReturnType>, scale);
 
-                return true;
+                    return true;
+                }
             }
-            else if constexpr (IsDataTypeDateOrDateTime<DataType> && (aggregate_operation == AggregateOperation::max || aggregate_operation == AggregateOperation::min))
+            else if constexpr (aggregate_operation == AggregateOperation::max || aggregate_operation == AggregateOperation::min)
             {
                 if constexpr (IsDataTypeDate<DataType>)
                 {
@@ -143,7 +147,7 @@ struct ArrayAggregateImpl
                 else if constexpr (!IsDataTypeDecimal<DataType>)
                 {
                     std::string timezone = getDateTimeTimezone(*expression_return);
-                    result = std::make_shared<DataType>(timezone);
+                    result = std::make_shared<DataTypeDateTime>(timezone);
 
                     return true;
                 }
@@ -151,7 +155,7 @@ struct ArrayAggregateImpl
                 {
                     std::string timezone = getDateTimeTimezone(*expression_return);
                     UInt32 scale = getDecimalScale(*expression_return);
-                    result = std::make_shared<DataType>(scale, timezone);
+                    result = std::make_shared<DataTypeDateTime64>(scale, timezone);
 
                     return true;
                 }