Ensure parsed times are stored in UTC
This commit is contained in:
parent
9940640a45
commit
9bbbf4491a
3 changed files with 45 additions and 5 deletions
|
@ -593,12 +593,20 @@ func (s *Scanner) scanString(chp ...rune) (tok Token, lit string, val interface{
|
||||||
return DURATION, buf.String(), val
|
return DURATION, buf.String(), val
|
||||||
}
|
}
|
||||||
|
|
||||||
if val, err := time.Parse("2006-01-02", buf.String()); err == nil {
|
if val, err := time.Parse(RFCDate, buf.String()); err == nil {
|
||||||
return DATE, buf.String(), val
|
return DATE, buf.String(), val.UTC()
|
||||||
}
|
}
|
||||||
|
|
||||||
if val, err := time.Parse(time.RFC3339, buf.String()); err == nil {
|
if val, err := time.Parse(RFCTime, buf.String()); err == nil {
|
||||||
return TIME, buf.String(), val
|
return TIME, buf.String(), val.UTC()
|
||||||
|
}
|
||||||
|
|
||||||
|
if val, err := time.Parse(RFCNorm, buf.String()); err == nil {
|
||||||
|
return TIME, buf.String(), val.UTC()
|
||||||
|
}
|
||||||
|
|
||||||
|
if val, err := time.Parse(RFCText, buf.String()); err == nil {
|
||||||
|
return TIME, buf.String(), val.UTC()
|
||||||
}
|
}
|
||||||
|
|
||||||
return tok, buf.String(), val
|
return tok, buf.String(), val
|
||||||
|
|
32
sql/sql.go
Normal file
32
sql/sql.go
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
// Copyright © 2016 Abcum Ltd
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package sql
|
||||||
|
|
||||||
|
import (
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
// Parsing format for date times
|
||||||
|
RFCDate = "2006-01-02"
|
||||||
|
// Parsing format for normal times
|
||||||
|
RFCNorm = time.RFC1123
|
||||||
|
// Parsing format for json date times
|
||||||
|
RFCTime = time.RFC3339
|
||||||
|
// Parsing format for json nanosecond times
|
||||||
|
RFCNano = time.RFC3339Nano
|
||||||
|
// Parsing format for readable text format date times
|
||||||
|
RFCText = "2006-01-02 15:04:05.999999999 -0700 MST"
|
||||||
|
)
|
|
@ -109,7 +109,7 @@ func (p *Parser) declare(tok Token, lit string) (interface{}, error) {
|
||||||
return &Table{lit}, nil
|
return &Table{lit}, nil
|
||||||
|
|
||||||
case NOW:
|
case NOW:
|
||||||
return time.Now(), nil
|
return time.Now().UTC(), nil
|
||||||
|
|
||||||
case DATE:
|
case DATE:
|
||||||
return time.Parse("2006-01-02", lit)
|
return time.Parse("2006-01-02", lit)
|
||||||
|
|
Loading…
Reference in a new issue