diff options
| -rw-r--r-- | sqlite3.go | 34 | ||||
| -rw-r--r-- | sqlite3_test.go | 17 |
2 files changed, 25 insertions, 26 deletions
@@ -423,13 +423,8 @@ func (s *SQLiteStmt) bind(args []driver.Value) error { } rv = C._sqlite3_bind_blob(s.s, n, unsafe.Pointer(p), C.int(len(v))) case time.Time: - if s.c.loc != nil { - b := []byte(v.In(s.c.loc).Format(SQLiteTimestampFormats[0])) - rv = C._sqlite3_bind_text(s.s, n, (*C.char)(unsafe.Pointer(&b[0])), C.int(len(b))) - } else { - b := []byte(v.UTC().Format(SQLiteTimestampFormats[0])) - rv = C._sqlite3_bind_text(s.s, n, (*C.char)(unsafe.Pointer(&b[0])), C.int(len(b))) - } + b := []byte(v.UTC().Format(SQLiteTimestampFormats[0])) + rv = C._sqlite3_bind_text(s.s, n, (*C.char)(unsafe.Pointer(&b[0])), C.int(len(b))) } if rv != C.SQLITE_OK { return s.c.lastError() @@ -536,11 +531,18 @@ func (rc *SQLiteRows) Next(dest []driver.Value) error { return fmt.Errorf("error parsing %s value %d, %s", rc.decltype[i], val, err) } epoch := time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC) - dest[i] = epoch.Add(duration) + if rc.s.c.loc != nil { + dest[i] = epoch.Add(duration).In(rc.s.c.loc) + } else { + dest[i] = epoch.Add(duration) + } } else { - dest[i] = time.Unix(val, 0).Local() + if rc.s.c.loc != nil { + dest[i] = time.Unix(val, 0).In(rc.s.c.loc) + } else { + dest[i] = time.Unix(val, 0) + } } - case "boolean": dest[i] = val > 0 default: @@ -572,13 +574,13 @@ func (rc *SQLiteRows) Next(dest []driver.Value) error { switch rc.decltype[i] { case "timestamp", "datetime", "date": - zone := rc.s.c.loc - if zone == nil { - zone = time.UTC - } for _, format := range SQLiteTimestampFormats { - if timeVal, err = time.ParseInLocation(format, s, zone); err == nil { - dest[i] = timeVal + if timeVal, err = time.ParseInLocation(format, s, time.UTC); err == nil { + if rc.s.c.loc != nil { + dest[i] = timeVal.In(rc.s.c.loc) + } else { + dest[i] = timeVal + } break } } diff --git a/sqlite3_test.go b/sqlite3_test.go index 325ba8e..1036525 100644 --- a/sqlite3_test.go +++ b/sqlite3_test.go @@ -11,6 +11,7 @@ import ( "encoding/hex" "os" "path/filepath" + "strings" "testing" "time" @@ -746,16 +747,12 @@ func TestStress(t *testing.T) { func TestDateTimeLocal(t *testing.T) { zone := "Asia/Tokyo" - z, err := time.LoadLocation(zone) - if err != nil { - t.Skip("Failed to load timezon:", err) - } tempFilename := TempFilename() db, err := sql.Open("sqlite3", "file:///"+tempFilename+"?loc="+zone) if err != nil { t.Fatal("Failed to open database:", err) } - db.Exec("CREATE TABLE foo (id datetime);") + db.Exec("CREATE TABLE foo (dt datetime);") db.Exec("INSERT INTO foo VALUES('2015-03-05 15:16:17');") row := db.QueryRow("select * from foo") @@ -764,7 +761,7 @@ func TestDateTimeLocal(t *testing.T) { if err != nil { t.Fatal("Failed to scan datetime:", err) } - if d.Local().Hour() != 15 { + if d.Hour() == 15 || !strings.Contains(d.String(), "JST") { t.Fatal("Result should have timezone", d) } db.Close() @@ -779,8 +776,8 @@ func TestDateTimeLocal(t *testing.T) { if err != nil { t.Fatal("Failed to scan datetime:", err) } - if d.In(z).Hour() == 15 { - t.Fatalf("Result should not have timezone %v", zone) + if d.UTC().Hour() != 15 || !strings.Contains(d.String(), "UTC") { + t.Fatalf("Result should not have timezone %v %v", zone, d.String()) } _, err = db.Exec("DELETE FROM foo") @@ -804,8 +801,8 @@ func TestDateTimeLocal(t *testing.T) { if err != nil { t.Fatal("Failed to scan datetime:", err) } - if d.Hour() == 15 { - t.Fatalf("Result should have timezone %v", zone) + if d.Hour() != 15 || !strings.Contains(d.String(), "JST") { + t.Fatalf("Result should have timezone %v %v", zone, d.String()) } } |