go/go-clickhouse
1
0
Fork 0
mirror of https://github.com/uptrace/go-clickhouse.git synced 2025-07-07 00:35:46 +02:00
Code Issues Releases Activity

fix: continue working with non UTC timezone

Browse Source
This commit is contained in:
Vladimir Mihailenco
2022-03-28 16:41:07 +03:00
parent 43a65a02e4
commit 033c41395a
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -24,7 +24,7 @@ Main features are:
Unsupported: Unsupported:
- Server timezones other than UTC. - `DateTime64`
Resources: Resources:

15
ch/chproto/server_info.go
View File

@ -1,9 +1,5 @@
package chproto package chproto
import (
"fmt"
)
type ServerInfo struct { type ServerInfo struct {
Name string Name string
MinorVersion uint64 MinorVersion uint64
@ -25,18 +21,13 @@ func (srv *ServerInfo) ReadFrom(rd *Reader) (err error) {
return err return err
} }
timezone, err := rd.String() if _, err := rd.String(); err != nil { // timezone
if err != nil {
return err return err
} }
if timezone != "UTC" { if _, err := rd.String(); err != nil { // display name
return fmt.Errorf("ch: ClickHouse server uses timezone=%q, expected UTC", timezone)
}
if _, err = rd.String(); err != nil { // display name
return err return err
} }
if _, err = rd.Uvarint(); err != nil { // server version patch if _, err := rd.Uvarint(); err != nil { // server version patch
return err return err
} }

5
ch/chschema/append.go
View File

@ -106,7 +106,10 @@ func AppendString(b []byte, s string) []byte {
} }
func AppendTime(b []byte, tm time.Time) []byte { func AppendTime(b []byte, tm time.Time) []byte {
return tm.UTC().AppendFormat(b, "'2006-01-02 15:04:05'") b = append(b, "toDateTime('"...)
b = tm.UTC().AppendFormat(b, "2006-01-02 15:04:05")
b = append(b, "', 'UTC')"...)
return b
} }
func AppendBytes(b []byte, bytes []byte) []byte { func AppendBytes(b []byte, bytes []byte) []byte {