diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-09-29 12:46:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-29 12:46:30 -0700 |
| commit | b84736e9b6401df0c6eeab9950bef09458a6aefd (patch) | |
| tree | d9175208de3236db75a33879750a57b3000ba096 /vendor/github.com/lib/pq/encode.go | |
| parent | 8b9dbb86133ff0fd6002a391268383d1593918ca (diff) | |
| download | chat-b84736e9b6401df0c6eeab9950bef09458a6aefd.tar.gz chat-b84736e9b6401df0c6eeab9950bef09458a6aefd.tar.bz2 chat-b84736e9b6401df0c6eeab9950bef09458a6aefd.zip | |
Updating server dependancies. (#7538)
Diffstat (limited to 'vendor/github.com/lib/pq/encode.go')
| -rw-r--r-- | vendor/github.com/lib/pq/encode.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/vendor/github.com/lib/pq/encode.go b/vendor/github.com/lib/pq/encode.go index 88a322cda..3b0d365f2 100644 --- a/vendor/github.com/lib/pq/encode.go +++ b/vendor/github.com/lib/pq/encode.go @@ -367,8 +367,15 @@ func ParseTimestamp(currentLocation *time.Location, str string) (time.Time, erro timeSep := daySep + 3 day := p.mustAtoi(str, daySep+1, timeSep) + minLen := monSep + len("01-01") + 1 + + isBC := strings.HasSuffix(str, " BC") + if isBC { + minLen += 3 + } + var hour, minute, second int - if len(str) > monSep+len("01-01")+1 { + if len(str) > minLen { p.expect(str, ' ', timeSep) minSep := timeSep + 3 p.expect(str, ':', minSep) @@ -424,7 +431,8 @@ func ParseTimestamp(currentLocation *time.Location, str string) (time.Time, erro tzOff = tzSign * ((tzHours * 60 * 60) + (tzMin * 60) + tzSec) } var isoYear int - if remainderIdx+3 <= len(str) && str[remainderIdx:remainderIdx+3] == " BC" { + + if isBC { isoYear = 1 - year remainderIdx += 3 } else { |