Skip to content

fix(types-timestamp): Ensure timestamp is UTC #716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 2, 2023
Merged

fix(types-timestamp): Ensure timestamp is UTC #716

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa65add
fix(types-timestamp): Ensure timestamp is UTC
erezrokah Mar 2, 2023
7815c45
Merge branch 'main' into fix/timestamp_utc
kodiakhq[bot] Mar 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 6 additions & 21 deletions schema/timestamptz.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ func (dst *Timestamptz) Set(src any) error {

switch value := src.(type) {
case int:
*dst = Timestamptz{Time: time.Unix(int64(value), 0), Status: Present}
*dst = Timestamptz{Time: time.Unix(int64(value), 0).UTC(), Status: Present}
case int64:
*dst = Timestamptz{Time: time.Unix(value, 0), Status: Present}
*dst = Timestamptz{Time: time.Unix(value, 0).UTC(), Status: Present}
case uint64:
*dst = Timestamptz{Time: time.Unix(int64(value), 0), Status: Present}
*dst = Timestamptz{Time: time.Unix(int64(value), 0).UTC(), Status: Present}
case time.Time:
*dst = Timestamptz{Time: value, Status: Present}
*dst = Timestamptz{Time: value.UTC(), Status: Present}
case *time.Time:
if value == nil {
*dst = Timestamptz{Status: Null}
Expand Down Expand Up @@ -162,31 +162,16 @@ func (dst *Timestamptz) DecodeText(src []byte) error {
// there is no good way of detecting format so we just try few of them
tim, err = time.Parse(time.RFC3339, sbuf)
if err == nil {
*dst = Timestamptz{Time: normalizePotentialUTC(tim), Status: Present}
*dst = Timestamptz{Time: tim.UTC(), Status: Present}
return nil
}
tim, err = time.Parse(defaultStringFormat, sbuf)
if err == nil {
*dst = Timestamptz{Time: normalizePotentialUTC(tim), Status: Present}
*dst = Timestamptz{Time: tim.UTC(), Status: Present}
return nil
}
return &ValidationError{Type: TypeTimestamp, Msg: "cannot parse timestamp", Value: sbuf, Err: err}
}

return nil
}

// Normalize timestamps in UTC location to behave similarly to how the Golang
// standard library does it: UTC timestamps lack a .loc value.
//
// Reason for this: when comparing two timestamps with reflect.DeepEqual (generally
// speaking not a good idea, but several testing libraries (for example testify)
// does this), their location data needs to be equal for them to be considered
// equal.
func normalizePotentialUTC(timestamp time.Time) time.Time {
if timestamp.Location().String() != time.UTC.String() {
return timestamp
}

return timestamp.UTC()
}