mirror
/
go-sqlcipher
mirror of https://github.com/xeodou/go-sqlcipher.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #155 from kartaca/master 

fixed timezone problem for datetime types
This commit is contained in:
mattn 2014-10-24 18:22:46 +09:00
parent 00716954b7 6710e996b5
commit c1aa7ac706
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sqlite3.go
View File

@ -498,7 +498,7 @@ func (rc *SQLiteRows) Next(dest []driver.Value) error {
val := int64(C.sqlite3_column_int64(rc.s.s, C.int(i))) val := int64(C.sqlite3_column_int64(rc.s.s, C.int(i)))
switch rc.decltype[i] { switch rc.decltype[i] {
case "timestamp", "datetime", "date": case "timestamp", "datetime", "date":
dest[i] = time.Unix(val, 0) dest[i] = time.Unix(val, 0).Local()
case "boolean": case "boolean":
dest[i] = val > 0 dest[i] = val > 0
default: default:
@ -525,12 +525,14 @@ func (rc *SQLiteRows) Next(dest []driver.Value) error {
dest[i] = nil dest[i] = nil
case C.SQLITE_TEXT: case C.SQLITE_TEXT:
var err error var err error
var timeVal time.Time
s := C.GoString((*C.char)(unsafe.Pointer(C.sqlite3_column_text(rc.s.s, C.int(i))))) s := C.GoString((*C.char)(unsafe.Pointer(C.sqlite3_column_text(rc.s.s, C.int(i)))))
switch rc.decltype[i] { switch rc.decltype[i] {
case "timestamp", "datetime", "date": case "timestamp", "datetime", "date":
for _, format := range SQLiteTimestampFormats { for _, format := range SQLiteTimestampFormats {
if dest[i], err = time.Parse(format, s); err == nil { if timeVal, err = time.ParseInLocation(format, s, time.UTC); err == nil {
dest[i] = timeVal.Local()
break break
} }
} }