From bd8d1252d1d6791a308e67f9aa6f1168e1879673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= Date: Tue, 9 Aug 2022 16:46:38 +0800 Subject: [PATCH] - update get db --- beego_get.go | 10 ++++++++++ bun_get.go | 10 ++++++++++ const.go | 3 +++ go.mod | 2 +- gorm.go | 4 ---- gorm_get.go | 8 ++++++++ redis.go | 4 ---- redis_get.go | 8 ++++++++ upper_get.go | 10 ++++++++++ version.go | 3 --- xorm_get.go | 10 ++++++++++ zorm_get.go | 10 ++++++++++ 12 files changed, 70 insertions(+), 12 deletions(-) create mode 100644 beego_get.go create mode 100644 bun_get.go create mode 100644 const.go create mode 100644 gorm_get.go create mode 100644 redis_get.go create mode 100644 upper_get.go delete mode 100644 version.go create mode 100644 xorm_get.go create mode 100644 zorm_get.go diff --git a/beego_get.go b/beego_get.go new file mode 100644 index 0000000..ad6516d --- /dev/null +++ b/beego_get.go @@ -0,0 +1,10 @@ +package dorm + +import ( + "github.com/beego/beego/v2/client/orm" +) + +// GetDb 获取驱动 +func (c *BeegoClient) GetDb() *orm.Ormer { + return c.Db +} diff --git a/bun_get.go b/bun_get.go new file mode 100644 index 0000000..b877d88 --- /dev/null +++ b/bun_get.go @@ -0,0 +1,10 @@ +package dorm + +import ( + "github.com/uptrace/bun" +) + +// GetDb 获取驱动 +func (c *BunClient) GetDb() *bun.DB { + return c.Db +} diff --git a/const.go b/const.go new file mode 100644 index 0000000..834c5a5 --- /dev/null +++ b/const.go @@ -0,0 +1,3 @@ +package dorm + +const Version = "1.0.12" diff --git a/go.mod b/go.mod index 8af8a37..96c54c9 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module go.dtapp.net/dorm -go 1.18 +go 1.19 require ( gitee.com/chunanyong/dm v1.8.5 diff --git a/gorm.go b/gorm.go index d541c28..afa8982 100644 --- a/gorm.go +++ b/gorm.go @@ -33,10 +33,6 @@ type GormClient struct { config *ConfigGormClient // 配置 } -func (c *GormClient) GetDb() *gorm.DB { - return c.Db -} - type writer struct{} // 日志路径 diff --git a/gorm_get.go b/gorm_get.go new file mode 100644 index 0000000..613d3bd --- /dev/null +++ b/gorm_get.go @@ -0,0 +1,8 @@ +package dorm + +import "gorm.io/gorm" + +// GetDb 获取驱动 +func (c *GormClient) GetDb() *gorm.DB { + return c.Db +} diff --git a/redis.go b/redis.go index d9fde1f..605df1c 100644 --- a/redis.go +++ b/redis.go @@ -47,7 +47,3 @@ func NewRedisClient(config *ConfigRedisClient) (*RedisClient, error) { return c, nil } - -func (c *RedisClient) GetDb() *redis.Client { - return c.Db -} diff --git a/redis_get.go b/redis_get.go new file mode 100644 index 0000000..0761b17 --- /dev/null +++ b/redis_get.go @@ -0,0 +1,8 @@ +package dorm + +import "github.com/go-redis/redis/v8" + +// GetDb 获取驱动 +func (c *RedisClient) GetDb() *redis.Client { + return c.Db +} diff --git a/upper_get.go b/upper_get.go new file mode 100644 index 0000000..2213f1f --- /dev/null +++ b/upper_get.go @@ -0,0 +1,10 @@ +package dorm + +import ( + "github.com/upper/db/v4" +) + +// GetDb 获取驱动 +func (c *UpperClient) GetDb() *db.Session { + return c.Db +} diff --git a/version.go b/version.go deleted file mode 100644 index a2a64df..0000000 --- a/version.go +++ /dev/null @@ -1,3 +0,0 @@ -package dorm - -const Version = "1.0.11" diff --git a/xorm_get.go b/xorm_get.go new file mode 100644 index 0000000..394ccae --- /dev/null +++ b/xorm_get.go @@ -0,0 +1,10 @@ +package dorm + +import ( + "xorm.io/xorm" +) + +// GetDb 获取驱动 +func (c *XormClient) GetDb() *xorm.Engine { + return c.Db +} diff --git a/zorm_get.go b/zorm_get.go new file mode 100644 index 0000000..e1be6cb --- /dev/null +++ b/zorm_get.go @@ -0,0 +1,10 @@ +package dorm + +import ( + "gitee.com/chunanyong/zorm" +) + +// GetDb 获取驱动 +func (c *ZormClient) GetDb() *zorm.DBDao { + return c.Db +}