Skip to content

fix precision for utc_timestamp #2231

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
jycor merged 2 commits into from
Jan 3, 2024
Merged

fix precision for utc_timestamp #2231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c80b9f1
time location?
Jan 3, 2024
6d68950
fix precision for utc_timestamp
Jan 3, 2024
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
4 changes: 2 additions & 2 deletions enginetest/queries/script_queries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3732,7 +3732,7 @@ CREATE TABLE tab3 (
},
{
// When the session's time zone is set to UTC, NOW() and UTC_TIMESTAMP() should return the same value
Query: `select @@time_zone, NOW() = UTC_TIMESTAMP();`,
Query: `select @@time_zone, NOW(6) = UTC_TIMESTAMP();`,
Expected: []sql.Row{{"+00:00", true}},
},
{
Expand All @@ -3746,7 +3746,7 @@ CREATE TABLE tab3 (
},
{
// When the session's time zone is set to +2:00, NOW() should report two hours ahead of UTC_TIMESTAMP()
Query: `select @@time_zone, TIMESTAMPDIFF(MINUTE, NOW(), UTC_TIMESTAMP());`,
Query: `select @@time_zone, TIMESTAMPDIFF(MINUTE, NOW(6), UTC_TIMESTAMP());`,
Expected: []sql.Row{{"+02:00", -120}},
},
{
Expand Down
5 changes: 3 additions & 2 deletions sql/expression/function/time.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,7 +990,7 @@ func (n *Now) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
nano := precision * (t.Nanosecond() / precision)

// Generate a new timestamp
tt := time.Date(t.Year(), t.Month(), t.Day(), t.Hour(), t.Minute(), t.Second(), nano, t.Location())
tt := time.Date(t.Year(), t.Month(), t.Day(), t.Hour(), t.Minute(), t.Second(), nano, time.UTC)

return tt, nil
}
Expand Down Expand Up @@ -1099,7 +1099,8 @@ func (ut *UTCTimestamp) Children() []sql.Expression { return nil }
func (ut *UTCTimestamp) Eval(ctx *sql.Context, _ sql.Row) (interface{}, error) {
t := ctx.QueryTime()
// TODO: UTC Timestamp needs to also handle precision arguments
tt := time.Date(t.Year(), t.Month(), t.Day(), t.Hour(), t.Minute(), t.Second(), 0, t.Location())
nano := 1000 * (t.Nanosecond() / 1000)
tt := time.Date(t.Year(), t.Month(), t.Day(), t.Hour(), t.Minute(), t.Second(), nano, t.Location())
return tt.UTC(), nil
}

Expand Down