diff --git a/stdlib/sql.go b/stdlib/sql.go index b1907c484..8f8940c94 100644 --- a/stdlib/sql.go +++ b/stdlib/sql.go @@ -852,6 +852,16 @@ func (r *Rows) initValueFuncs() { if err != nil { return nil, err } + + if d.InfinityModifier == pgtype.Finite { + timezone := r.conn.conn.PgConn().ParameterStatus("TimeZone") + lc, err := time.LoadLocation(timezone) + if err != nil { + return nil, err + } + d.Time = d.Time.In(lc) + } + return d.Value() } case pgtype.XMLOID: