From d04b8188038d2271df7d4f434f217e2390b74faa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= Date: Fri, 24 Feb 2023 16:25:17 +0800 Subject: [PATCH] - update dorm --- utils/dorm/bun.go | 2 +- utils/dorm/bun_get.go | 10 ++++++++++ utils/dorm/bun_mysql.go | 2 +- utils/dorm/bun_postgresql.go | 4 ++-- utils/dorm/upper.go | 2 +- utils/dorm/upper_get.go | 10 ++++++++++ utils/dorm/upper_mysql.go | 2 +- utils/dorm/upper_postgresql.go | 2 +- utils/dorm/zorm.go | 2 +- utils/dorm/zorm_get.go | 10 ++++++++++ utils/dorm/zorm_mysql.go | 14 ++++---------- utils/dorm/zorm_postgresql.go | 14 ++++---------- 12 files changed, 46 insertions(+), 28 deletions(-) create mode 100644 utils/dorm/bun_get.go create mode 100644 utils/dorm/upper_get.go create mode 100644 utils/dorm/zorm_get.go diff --git a/utils/dorm/bun.go b/utils/dorm/bun.go index 46b5fe1c..ff1fe9b4 100644 --- a/utils/dorm/bun.go +++ b/utils/dorm/bun.go @@ -11,6 +11,6 @@ type ConfigBunClient struct { // BunClient // https://bun.uptrace.dev/ type BunClient struct { - Db *bun.DB // 驱动 + db *bun.DB // 驱动 config *ConfigBunClient // 配置 } diff --git a/utils/dorm/bun_get.go b/utils/dorm/bun_get.go new file mode 100644 index 00000000..f9d1cd89 --- /dev/null +++ b/utils/dorm/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/utils/dorm/bun_mysql.go b/utils/dorm/bun_mysql.go index 5a19616b..c6c4a633 100644 --- a/utils/dorm/bun_mysql.go +++ b/utils/dorm/bun_mysql.go @@ -19,7 +19,7 @@ func NewBunMysqlClient(config *ConfigBunClient) (*BunClient, error) { return nil, errors.New(fmt.Sprintf("加载驱动失败：%v", err)) } - c.Db = bun.NewDB(sqlDb, mysqldialect.New()) + c.db = bun.NewDB(sqlDb, mysqldialect.New()) return c, nil } diff --git a/utils/dorm/bun_postgresql.go b/utils/dorm/bun_postgresql.go index f39fb38a..49518d6d 100644 --- a/utils/dorm/bun_postgresql.go +++ b/utils/dorm/bun_postgresql.go @@ -7,13 +7,13 @@ import ( "github.com/uptrace/bun/driver/pgdriver" ) -func NewBunPgsqlClient(config *ConfigBunClient) (*BunClient, error) { +func NewBunPostgresqlClient(config *ConfigBunClient) (*BunClient, error) { c := &BunClient{config: config} sqlDb := sql.OpenDB(pgdriver.NewConnector(pgdriver.WithDSN(c.config.Dns))) - c.Db = bun.NewDB(sqlDb, pgdialect.New()) + c.db = bun.NewDB(sqlDb, pgdialect.New()) return c, nil } diff --git a/utils/dorm/upper.go b/utils/dorm/upper.go index 0a0d1801..1d8cf3cf 100644 --- a/utils/dorm/upper.go +++ b/utils/dorm/upper.go @@ -5,5 +5,5 @@ import "github.com/upper/db/v4" // UpperClient // https://upper.io/ type UpperClient struct { - Db *db.Session // 驱动 + db *db.Session // 驱动 } diff --git a/utils/dorm/upper_get.go b/utils/dorm/upper_get.go new file mode 100644 index 00000000..ae0a0752 --- /dev/null +++ b/utils/dorm/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/utils/dorm/upper_mysql.go b/utils/dorm/upper_mysql.go index 39d1820f..5d9854cc 100644 --- a/utils/dorm/upper_mysql.go +++ b/utils/dorm/upper_mysql.go @@ -17,7 +17,7 @@ func NewUpperMysqlClient(settings mysql.ConnectionURL) (*UpperClient, error) { } defer sess.Close() - c.Db = &sess + c.db = &sess return c, nil } diff --git a/utils/dorm/upper_postgresql.go b/utils/dorm/upper_postgresql.go index 35fff990..24a74d96 100644 --- a/utils/dorm/upper_postgresql.go +++ b/utils/dorm/upper_postgresql.go @@ -17,7 +17,7 @@ func NewUpperPostgresqlClient(settings postgresql.ConnectionURL) (*UpperClient, } defer sess.Close() - c.Db = &sess + c.db = &sess return c, nil } diff --git a/utils/dorm/zorm.go b/utils/dorm/zorm.go index 076368c0..417d7533 100644 --- a/utils/dorm/zorm.go +++ b/utils/dorm/zorm.go @@ -12,6 +12,6 @@ type ConfigZormClient struct { // https://zorm.cn/ // https://www.yuque.com/u27016943/nrgi00 type ZormClient struct { - Db *zorm.DBDao // 驱动 + db *zorm.DBDao // 驱动 config *ConfigZormClient // 配置 } diff --git a/utils/dorm/zorm_get.go b/utils/dorm/zorm_get.go new file mode 100644 index 00000000..1cd44a24 --- /dev/null +++ b/utils/dorm/zorm_get.go @@ -0,0 +1,10 @@ +package dorm + +import ( + "gitee.com/chunanyong/zorm" +) + +// GetDb 获取驱动 +func (c *ZormClient) GetDb() *zorm.DBDao { + return c.db +} diff --git a/utils/dorm/zorm_mysql.go b/utils/dorm/zorm_mysql.go index 2ea6938d..6fdde74d 100644 --- a/utils/dorm/zorm_mysql.go +++ b/utils/dorm/zorm_mysql.go @@ -12,16 +12,10 @@ func NewZormMysqlClient(config *ConfigZormClient) (*ZormClient, error) { var err error c := &ZormClient{config: config} - c.Db, err = zorm.NewDBDao(&zorm.DataSourceConfig{ - DSN: c.config.Dns, - DriverName: "mysql", // 数据库驱动名称 - DBType: "mysql", // 数据库类型 - PrintSQL: true, // 是否打印sql - MaxOpenConns: 0, // 数据库最大连接数,默认50 - MaxIdleConns: 0, // 数据库最大空闲连接数,默认50 - ConnMaxLifetimeSecond: 0, // 连接存活秒时间. 默认600(10分钟)后连接被销毁重建. - // 避免数据库主动断开连接,造成死连接.MySQL默认wait_timeout 28800秒(8小时) - DefaultTxOptions: nil, // 事务隔离级别的默认配置,默认为nil + c.db, err = zorm.NewDBDao(&zorm.DataSourceConfig{ + DSN: c.config.Dns, + DriverName: "mysql", // 数据库驱动名称 + Dialect: "mysql", // 数据库类型 }) if err != nil { return nil, errors.New(fmt.Sprintf("连接失败：%v", err)) diff --git a/utils/dorm/zorm_postgresql.go b/utils/dorm/zorm_postgresql.go index c12e6031..238ce97d 100644 --- a/utils/dorm/zorm_postgresql.go +++ b/utils/dorm/zorm_postgresql.go @@ -12,16 +12,10 @@ func NewZormPostgresqlClient(config *ConfigZormClient) (*ZormClient, error) { var err error c := &ZormClient{config: config} - c.Db, err = zorm.NewDBDao(&zorm.DataSourceConfig{ - DSN: c.config.Dns, - DriverName: "postgres", // 数据库驱动名称 - DBType: "postgresql", // 数据库类型 - PrintSQL: true, // 是否打印sql - MaxOpenConns: 0, // 数据库最大连接数,默认50 - MaxIdleConns: 0, // 数据库最大空闲连接数,默认50 - ConnMaxLifetimeSecond: 0, // 连接存活秒时间. 默认600(10分钟)后连接被销毁重建. - // 避免数据库主动断开连接,造成死连接.MySQL默认wait_timeout 28800秒(8小时) - DefaultTxOptions: nil, // 事务隔离级别的默认配置,默认为nil + c.db, err = zorm.NewDBDao(&zorm.DataSourceConfig{ + DSN: c.config.Dns, + DriverName: "postgres", // 数据库驱动名称 + Dialect: "postgresql", // 数据库类型 }) if err != nil { return nil, errors.New(fmt.Sprintf("连接失败：%v", err))