diff --git a/lib/optimization/table_data.go b/lib/optimization/table_data.go index c7cb08421..9a5681c89 100644 --- a/lib/optimization/table_data.go +++ b/lib/optimization/table_data.go @@ -296,7 +296,7 @@ func (t *TableData) MergeColumnsFromDestination(destCols ...columns.Column) erro // If the column in the destination is a timestamp_tz and the in-memory column is a timestamp_ntz, we should update the layout to contain timezone locale. if foundColumn.KindDetails.ExtendedTimeDetails.Type == ext.TimestampTzKindType && inMemoryCol.KindDetails.ExtendedTimeDetails.Type == ext.TimestampNTZKindType { if inMemoryCol.KindDetails.ExtendedTimeDetails.Format != "" { - inMemoryCol.KindDetails.ExtendedTimeDetails.Format += ext.TimezoneOffset + inMemoryCol.KindDetails.ExtendedTimeDetails.Format += ext.TimezoneOffsetFormat } } diff --git a/lib/typing/ext/variables.go b/lib/typing/ext/variables.go index fba72f2b5..defea4453 100644 --- a/lib/typing/ext/variables.go +++ b/lib/typing/ext/variables.go @@ -44,17 +44,17 @@ var SupportedTimeFormats = []string{ AdditionalTimeFormat, } -const TimezoneOffset = "Z07:00" +const TimezoneOffsetFormat = "Z07:00" // RFC3339 variants const ( RFC3339MillisecondUTC = "2006-01-02T15:04:05.000Z" RFC3339MicrosecondUTC = "2006-01-02T15:04:05.000000Z" RFC3339NanosecondUTC = "2006-01-02T15:04:05.000000000Z" - RFC3339Millisecond = "2006-01-02T15:04:05.000" + TimezoneOffset + RFC3339Millisecond = "2006-01-02T15:04:05.000" + TimezoneOffsetFormat RFC3339MillisecondNoTZ = "2006-01-02T15:04:05.000" - RFC3339Microsecond = "2006-01-02T15:04:05.000000" + TimezoneOffset + RFC3339Microsecond = "2006-01-02T15:04:05.000000" + TimezoneOffsetFormat RFC3339MicrosecondNoTZ = "2006-01-02T15:04:05.000000" - RFC3339Nanosecond = "2006-01-02T15:04:05.000000000" + TimezoneOffset + RFC3339Nanosecond = "2006-01-02T15:04:05.000000000" + TimezoneOffsetFormat RFC3339NanosecondNoTZ = "2006-01-02T15:04:05.000000000" )