update: 兼容PostgreSQL的timetz类型

Author: zodial

bootstrap/services/database/pgTime.go

@@ -13,7 +13,7 @@ type PgTime struct {
 // Value Implements Valuer interface for writing to DB
 func (pt PgTime) Value() (driver.Value, error) {
 	// 格式化为 HH:MM:SS.ssssss
-	return pt.Time.Format("15:04:05.999999"), nil
+	return pt.String(), nil
 }
 
 // Scan Implements Scanner interface for reading from DB
@@ -42,11 +42,11 @@ func (pt *PgTime) Scan(value interface{}) error {
 }
 
 func (pt PgTime) MarshalJSON() ([]byte, error) {
-	return []byte(fmt.Sprintf(`"%s"`, pt.Format("15:04:05"))), nil
+	return []byte(fmt.Sprintf(`"%s"`, pt.String())), nil
 }
 
 func (pt *PgTime) UnmarshalJSON(data []byte) error {
-	t, err := time.Parse(`"15:04:05"`, string(data))
+	t, err := time.Parse(`"15:04:05.999999"`, string(data))
 	if err != nil {
 		return err
 	}
@@ -58,13 +58,17 @@ func (pt PgTime) String() string {
 	return pt.Format("15:04:05.999999")
 }
 
+func (pt PgTime) His() string {
+	return pt.Format("15:04:05")
+}
+
 func (pt PgTime) Add(d time.Duration) PgTime {
 	return PgTime{
 		Time: pt.Time.Add(d),
 	}
 }
 
 func StrToPgTime(str string) PgTime {
-	tm, _ := time.ParseInLocation("15:04:05.999999", str, time.Local)
+	tm, _ := time.Parse("15:04:05.999999", str)
 	return PgTime{tm}
 }

bootstrap/services/database/pgTimeTz.go

@@ -0,0 +1,73 @@
+package database
+
+import (
+	"database/sql/driver"
+	"fmt"
+	"time"
+)
+
+type PgTimeTz struct {
+	time.Time
+}
+
+// Value Implements Valuer interface for writing to DB
+func (pt PgTimeTz) Value() (driver.Value, error) {
+	// 格式化为 HH:MM:SS.ssssss
+	return pt.String(), nil
+}
+
+// Scan Implements Scanner interface for reading from DB
+func (pt *PgTimeTz) Scan(value interface{}) error {
+	switch v := value.(type) {
+	case time.Time:
+		pt.Time = v
+	case []byte:
+		// Parse byte array in HH:MM:SS[.ssssss]+TZ format
+		t, err := time.Parse("15:04:05.999999-07", string(v))
+		if err != nil {
+			return fmt.Errorf("timetz parsing failed: %v", err)
+		}
+		pt.Time = t
+	case string:
+		t, err := time.Parse("15:04:05.999999-07", v)
+		if err != nil {
+			return fmt.Errorf("timetz parsing failed: %v", err)
+		}
+		pt.Time = t
+	default:
+		return fmt.Errorf("unsupported type: %T", value)
+	}
+	return nil
+}
+
+func (pt PgTimeTz) MarshalJSON() ([]byte, error) {
+	return []byte(fmt.Sprintf(`"%s"`, pt.Format("15:04:05.999999-07"))), nil
+}
+
+func (pt *PgTimeTz) UnmarshalJSON(data []byte) error {
+	t, err := time.Parse(`"15:04:05.999999-07"`, string(data))
+	if err != nil {
+		return err
+	}
+	pt.Time = t
+	return nil
+}
+
+func (pt PgTimeTz) String() string {
+	return pt.Format("15:04:05.999999-07")
+}
+
+func (pt PgTimeTz) His(loc *time.Location) string {
+	return pt.Time.In(loc).Format("15:04:05")
+}
+
+func (pt PgTimeTz) Add(d time.Duration) PgTime {
+	return PgTime{
+		Time: pt.Time.Add(d),
+	}
+}
+
+func StrToPgTimeTz(str string) PgTimeTz {
+	tm, _ := time.Parse("15:04:05.999999-07", str)
+	return PgTimeTz{tm}
+}