feat: TimestamppbToTime & TimeToTimestamppb.

entgo/ent_client.go

@@ -1,11 +1,13 @@
 package entgo
 
 import (
+	"context"
+	"database/sql"
 	"errors"
 	"fmt"
 	"time"
 
-	"entgo.io/ent/dialect/sql"
+	entSql "entgo.io/ent/dialect/sql"
 )
 
 type entClientInterface interface {
@@ -14,10 +16,10 @@ type entClientInterface interface {
 
 type EntClient[T entClientInterface] struct {
 	db  T
-	drv *sql.Driver
+	drv *entSql.Driver
 }
 
-func NewEntClient[T entClientInterface](db T, drv *sql.Driver) *EntClient[T] {
+func NewEntClient[T entClientInterface](db T, drv *entSql.Driver) *EntClient[T] {
 	return &EntClient[T]{
 		db:  db,
 		drv: drv,
@@ -28,17 +30,29 @@ func (c *EntClient[T]) Client() T {
 	return c.db
 }
 
-func (c *EntClient[T]) Driver() *sql.Driver {
+func (c *EntClient[T]) Driver() *entSql.Driver {
 	return c.drv
 }
 
-func (c *EntClient[T]) Close() {
+func (c *EntClient[T]) DB() *sql.DB {
-	_ = c.db.Close()
+	return c.drv.DB()
+}
+
+func (c *EntClient[T]) Close() error {
+	return c.db.Close()
+}
+
+func (c *EntClient[T]) Query(ctx context.Context, query string, args, v any) error {
+	return c.Driver().Query(ctx, query, args, v)
+}
+
+func (c *EntClient[T]) Exec(ctx context.Context, query string, args, v any) error {
+	return c.Driver().Exec(ctx, query, args, v)
 }
 
 // CreateDriver 创建数据库驱动
-func CreateDriver(driverName, dsn string, maxIdleConnections, maxOpenConnections int, connMaxLifetime time.Duration) (*sql.Driver, error) {
+func CreateDriver(driverName, dsn string, maxIdleConnections, maxOpenConnections int, connMaxLifetime time.Duration) (*entSql.Driver, error) {
-	drv, err := sql.Open(driverName, dsn)
+	drv, err := entSql.Open(driverName, dsn)
 	if err != nil {
 		return nil, errors.New(fmt.Sprintf("failed opening connection to db: %v", err))
 	}

tag.bat

@@ -1,6 +1,6 @@
-git tag v1.1.9
+git tag v1.1.10
 git tag bank_card/v1.1.1
-git tag entgo/v1.1.12
+git tag entgo/v1.1.13
 git tag geoip/v1.1.1
 
 git push origin --tags

timeutil/trans.go

@@ -3,6 +3,8 @@ package util
 import (
 	"time"
 
+	"google.golang.org/protobuf/types/known/timestamppb"
+
 	"github.com/tx7do/go-utils/trans"
 )
 
@@ -114,3 +116,19 @@ func TimeToDateString(tm *time.Time) *string {
 	}
 	return trans.String(tm.Format(DateLayout))
 }
+
+// TimestamppbToTime timestamppb.Timestamp -> time.Time
+func TimestamppbToTime(tm *timestamppb.Timestamp) *time.Time {
+	if tm != nil {
+		return trans.Ptr(tm.AsTime())
+	}
+	return nil
+}
+
+// TimeToTimestamppb time.Time -> timestamppb.Timestamp
+func TimeToTimestamppb(tm *time.Time) *timestamppb.Timestamp {
+	if tm != nil {
+		return timestamppb.New(*tm)
+	}
+	return nil
+}