Compare commits

..

1 Commits

Author SHA1 Message Date
tx7do
ce853c6b87 feat: entgo interface. 2024-04-16 18:43:49 +08:00
2 changed files with 23 additions and 9 deletions

View File

@@ -1,11 +1,13 @@
package entgo package entgo
import ( import (
"context"
"database/sql"
"errors" "errors"
"fmt" "fmt"
"time" "time"
"entgo.io/ent/dialect/sql" entSql "entgo.io/ent/dialect/sql"
) )
type entClientInterface interface { type entClientInterface interface {
@@ -14,10 +16,10 @@ type entClientInterface interface {
type EntClient[T entClientInterface] struct { type EntClient[T entClientInterface] struct {
db T 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]{ return &EntClient[T]{
db: db, db: db,
drv: drv, drv: drv,
@@ -28,17 +30,29 @@ func (c *EntClient[T]) Client() T {
return c.db return c.db
} }
func (c *EntClient[T]) Driver() *sql.Driver { func (c *EntClient[T]) Driver() *entSql.Driver {
return c.drv 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 创建数据库驱动 // 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 { if err != nil {
return nil, errors.New(fmt.Sprintf("failed opening connection to db: %v", err)) return nil, errors.New(fmt.Sprintf("failed opening connection to db: %v", err))
} }

View File

@@ -1,6 +1,6 @@
git tag v1.1.9 git tag v1.1.9
git tag bank_card/v1.1.1 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 tag geoip/v1.1.1
git push origin --tags git push origin --tags