update mygorm

go.mod

@@ -3,11 +3,16 @@ module qoobing.com/gomod/model
 go 1.19.2
 
 require (
-	gorm.io/driver/postgres v1.5.9
+	qoobing.com/gomod/gorm v0.0.4
-	gorm.io/gorm v1.25.10
+	qoobing.com/gomod/log v1.4.2
-	qoobing.com/gomod/database v0.0.0-20240627111018-316f516e9b69
+	qoobing.com/gomod/redis v1.3.9
-	qoobing.com/gomod/log v1.2.8
+)
-	qoobing.com/gomod/redis v1.3.4
+
+require (
+	github.com/go-sql-driver/mysql v1.7.0 // indirect
+	gorm.io/driver/mysql v1.5.7 // indirect
+	gorm.io/driver/postgres v1.5.11 // indirect
+	gorm.io/gorm v1.25.12 // indirect
 )
 
 require (

go.sum

@@ -0,0 +1,53 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
+github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
+github.com/gomodule/redigo v1.9.2 h1:HrutZBLhSIU8abiSfW8pj8mPhOyMYjZT/wcA4/L9L9s=
+github.com/gomodule/redigo v1.9.2/go.mod h1:KsU3hiK/Ay8U42qpaJk+kuNa3C+spxapWpM+ywhcgtw=
+github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
+github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
+github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
+github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
+github.com/jackc/pgx/v5 v5.5.5 h1:amBjrZVmksIdNjxGW/IiIMzxMKZFelXbUoPNb+8sjQw=
+github.com/jackc/pgx/v5 v5.5.5/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A=
+github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
+github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
+github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
+github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
+github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/tylerb/gls v0.0.0-20150407001822-e606233f194d h1:yYYPFFlbqxF5mrj5sEfETtM/Ssz2LTy0/VKlDdXYctc=
+github.com/tylerb/gls v0.0.0-20150407001822-e606233f194d/go.mod h1:0MwyId/pXK5wkYYEXe7NnVknX+aNBuF73fLV3U0reU8=
+github.com/tylerb/is v2.1.4+incompatible h1:BMf2zP0kY2Ykzx2W1fDrjwKj1x1B4E0mELkpjaNy1tM=
+github.com/tylerb/is v2.1.4+incompatible/go.mod h1:3Bw2NWEEe8Kx7/etYqgm9ug53iNDgabnloch75jjOSc=
+golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
+golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gorm.io/driver/mysql v1.5.7 h1:MndhOPYOfEp2rHKgkZIhJ16eVUIRf2HmzgoPmh7FCWo=
+gorm.io/driver/mysql v1.5.7/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM=
+gorm.io/driver/postgres v1.5.11 h1:ubBVAfbKEUld/twyKZ0IYn9rSQh448EdelLYk9Mv314=
+gorm.io/driver/postgres v1.5.11/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI=
+gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
+gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
+qoobing.com/gomod/gorm v0.0.4 h1:tKBkL2AtMiB9txb3XsLll5+1NK5oIyJIuBGgm4N6OAQ=
+qoobing.com/gomod/gorm v0.0.4/go.mod h1:dGaviTlwtQl1amgr+DUmovoxk779WLL4+js7f2hvSwA=
+qoobing.com/gomod/log v1.4.2 h1:BR6WA79nUfvYhHww/Nbzu/iM9RdCfx3G3hg1XusjIIM=
+qoobing.com/gomod/log v1.4.2/go.mod h1:rNXuq0d/EWog4+8hIEVGvkusLD/pzafYBQo6w+Evv6A=
+qoobing.com/gomod/redis v1.3.9 h1:wtojzRP7T+p+MAzkAUrU8GLNDUMU84ZJ3U/cWPrDby8=
+qoobing.com/gomod/redis v1.3.9/go.mod h1:5j9kopj3CY1qf70OQ8IHQjDKHUl72rj0LhQgTBpl2BU=
+qoobing.com/gomod/str v1.0.1/go.mod h1:gbhN2dba/P5gFRGVJvEI57KEJLlMHHAd6Kuuxn4GlMY=
+qoobing.com/gomod/str v1.0.5 h1:AXEB8k/yhepLK5jVez+WL4sWVuCFb8pWAgmo3nvt96A=
+qoobing.com/gomod/str v1.0.5/go.mod h1:gbhN2dba/P5gFRGVJvEI57KEJLlMHHAd6Kuuxn4GlMY=

model.go

@@ -1,203 +1,143 @@
 package model
 
 import (
-	"strconv"
+	"fmt"
-	"strings"
+	"reflect"
-	"time"
+	"sync"
 
-	"gorm.io/driver/postgres"
+	"qoobing.com/gomod/gorm"
-	"gorm.io/gorm"
-	"qoobing.com/gomod/database"
 	"qoobing.com/gomod/log"
 	"qoobing.com/gomod/redis"
-	"qoobing.com/gomod/redis/sentinel"
-)
-
-type Model struct {
-	DB         *gorm.DB
-	DbTxStatus DbTxStatus
-	Redis      redis.Conn
-	RedisPool  *redis.Pool
-}
-
-type DbTxStatus int
-
-const (
-	DBTX_STATUS_TX_NONE    DbTxStatus = 0
-	DBTX_STATUS_TX_DOING   DbTxStatus = 1
-	DBTX_STATUS_TX_SUCCESS DbTxStatus = 2
-	DBTX_STATUS_TX_FAILED  DbTxStatus = 3
 )
 
 var (
-	defaultDb         *database.Config
+	modelsDb         = map[string]*modelDb{}
-	defaultDsn        string
+	modelsRedis      = map[string]*modelRedis{}
-	defaultDbDebug    bool
+	defaultDbName    = ""
-	defaultGormDB     *gorm.DB
+	defaultRedisName = ""
-	defaultRds        redis.Config
+
-	defaultRedis      *redis.Pool
+	errNoModelFound     = errorsWrap("named model(%s) not found")
-	defaultRedisDebug bool
+	errModeAlreadyInit  = errorsWrap("named model(%s) already initilized")
-	defaultOptions    []Option
+	errOpenDBFailed     = errorsWrap("open database failed: %s")
+	errOpenRedisFailed  = errorsWrap("open redis failed: %s")
+	errUnknownModelType = errorsWrap("unknown model type: %s")
 )
 
-func NewModel() *Model {
+func errorsWrap(base string) func(...any) error {
-	if len(defaultOptions) == 0 {
+	return func(v ...any) error {
-		panic("No defualt Database&Redis been configed")
+		return fmt.Errorf(base, v...)
-	}
-	return NewModelWithOption(defaultOptions...)
-}
-
-func NewModelDefault() *Model {
-	return NewModelWithOption(OptOpenDefaultDatabase, OptOpenDefaultRedis)
-}
-
-func NewModelDefaultRedis() *Model {
-	return NewModelWithOption(OptOpenDefaultRedis)
-}
-
-func NewModelDefaultDatabase() *Model {
-	return NewModelWithOption(OptOpenDefaultDatabase)
-}
-
-func NewModelWithOption(options ...Option) *Model {
-	n := 0
-	m := Model{}
-	log.Debugf("Start NewModelWithOption...")
-	for _, option := range options {
-		n++
-		option(&m)
-	}
-	log.Debugf("Finish NewModelWithOption(with %d options)", n)
-	return &m
-}
-
-func (m *Model) Close() {
-	if m.Redis != nil {
-		m.Redis.Close()
-	}
-	if m.DB == nil {
-		m.DbTxStatus = DBTX_STATUS_TX_NONE
-	} else if m.DbTxStatus == DBTX_STATUS_TX_DOING {
-		m.DB.Rollback()
-		m.DbTxStatus = DBTX_STATUS_TX_FAILED
 	}
 }
 
-func (m *Model) Begin() {
+type (
-	if m.DB == nil {
+	DbConfig     = gorm.Config
-		panic("unreachable code, m.DB is uninitialized")
+	RedisConfig  = redis.Config
-	} else if m.DbTxStatus != DBTX_STATUS_TX_NONE {
+	Configurable interface {
-		panic("unreachable code, begin transaction towice???")
+		*DbConfig | *RedisConfig
-	} else {
-		m.DbTxStatus = DBTX_STATUS_TX_DOING
-		m.DB = m.DB.Begin()
 	}
-}
+)
 
-func (m *Model) Commit() error {
+type (
-	if m.DB == nil {
+	modelDb struct {
-		panic("unreachable code, m.DB is uninitialized")
+		mu    sync.Mutex
-	} else if m.DbTxStatus != DBTX_STATUS_TX_DOING {
+		db    *gorm.DB
-		return nil
+		dbCfg *gorm.Config
-	} else if err := m.DB.Commit().Error; err != nil {
+	}
-		m.DbTxStatus = DBTX_STATUS_TX_FAILED
+
-		return err
+	modelRedis struct {
-	} else {
+		mu        sync.Mutex
-		m.DbTxStatus = DBTX_STATUS_TX_SUCCESS
+		redis     redis.Conn
+		redisCfg  *redis.Config
+		redisPool *redis.Pool
+	}
+)
+
+// Init init named database config & redis config
+func Init[Config Configurable](name string, cfg Config) error {
+	var (
+		dbCfg     *gorm.Config
+		redisCfg  *redis.Config
+		inCfgType = reflect.TypeOf(cfg)
+	)
+
+	if inCfgType == reflect.TypeOf(dbCfg) {
+		dbCfg = reflect.ValueOf(cfg).Interface().(*gorm.Config)
+		_, ok := modelsDb[name]
+		if ok {
+			return errModeAlreadyInit("db:" + name)
+		}
+		db, err := gorm.NewDB(*dbCfg)
+		if err != nil {
+			return errOpenDBFailed(err)
+		}
+		modelsDb[name] = &modelDb{
+			db:    db,
+			dbCfg: dbCfg,
+		}
+		if defaultDbName == "" || (defaultDbName != "" && name == "default") {
+			defaultDbName = name
+		}
+		log.Infof("success init model(%s) database:%s", name, dbCfg.GetSecDsn())
 		return nil
 	}
-}
 
-// Option is model's option
+	if inCfgType == reflect.TypeOf(redisCfg) {
-type Option func(*Model)
+		redisCfg = reflect.ValueOf(cfg).Interface().(*redis.Config)
-
+		_, ok := modelsRedis[name]
-// OptOpenDefaultDatabase option function for open default database
+		if ok {
-func OptOpenDefaultDatabase(m *Model) {
+			return errModeAlreadyInit("redis:" + name)
-	if defaultGormDB != nil {
-		m.DB = defaultGormDB
-	} else if db, err := gorm.Open(
-		postgres.New(postgres.Config{
-			DSN:                  defaultDsn,
-			PreferSimpleProtocol: true,
-		}), &gorm.Config{}); err != nil {
-		panic("DATABASE_OPEN_ERROR")
-	} else {
-		if defaultDbDebug {
-			m.DB = db.Debug()
-		} else {
-			m.DB = db
 		}
-		if sqlDB, err := m.DB.DB(); err != nil {
+		redisPool := redis.NewPool(*redisCfg)
-			panic("DATABASE_OPEN_ERROR")
+		if redisPool == nil {
-		} else {
+			return errOpenRedisFailed("new redis pool return nil")
-			sqlDB.SetMaxIdleConns(3)
-			sqlDB.SetMaxOpenConns(10)
-			sqlDB.SetConnMaxLifetime(time.Minute)
 		}
-		defaultGormDB = m.DB
+		modelsRedis[name] = &modelRedis{
-	}
+			redisPool: redisPool,
-	//TODO: check cocurrent
+			redisCfg:  redisCfg,
-	m.DB = m.DB.Session(&gorm.Session{QueryFields: true})
+		}
-	log.Debugf("Opt for open default database done")
+		if defaultRedisName == "" || (defaultRedisName != "" && name == "default") {
-	return
+			defaultRedisName = name
-}
+		}
-
+		log.Infof("success init model(%s) database:%s", name, redisCfg.GetSecDsn())
-// OptOpenDefaultRedisSentinelPool option function for open default redis sentinel
+		return nil
-func OptOpenDefaultRedis(m *Model) {
-	if defaultRedis != nil {
-		m.Redis = defaultRedis.Get()
-		m.RedisPool = defaultRedis
-	} else if pool := sentinel.NewPool(defaultRds); pool == nil {
-		panic("REDIS_ERROR")
-	} else {
-		defaultRedis = pool
-		m.Redis = defaultRedis.Get()
-		m.RedisPool = defaultRedis
 	}
 
-	log.Debugf("Opt for open default redis done")
+	log.Infof("failed init model(%s), unknown model type: %s", name, inCfgType.Name())
-	return
+	return errUnknownModelType(inCfgType.Name())
 }
 
-// Init init default database config & redis config
+func Db() *gorm.DB {
-func Init(defaultDb *database.Config, defaultRds *redis.Config) {
+	return DbOf(defaultDbName)
-	defaultOptions = []Option{}
+}
-
+
-	if defaultDb != nil{
+func DbOf(name string) *gorm.DB {
-		// database init
+	m, ok := modelsDb[name]
-		arrConfStr := []string{
+	if !ok {
-			"host=" + defaultDb.Host,
+		panic(errNoModelFound(name))
-			"port=" + strconv.Itoa(defaultDb.Port),
+	}
-			"user=" + defaultDb.Username,
+	return gorm.NewSession(m.db)
-			"password=" + defaultDb.Password,
+}
-			"dbname=" + defaultDb.Dbname,
+
-			defaultDb.ExtraParameters,
+func Redis() redis.Conn {
-		}
+	return RedisOf(defaultRedisName)
-		defaultDsn = strings.Join(arrConfStr, " ")
+}
-		defaultDbDebug = defaultDb.Debug
+
-		// database debug
+func RedisOf(name string) redis.Conn {
-		if defaultDbDebug && len(defaultDb.Password) > 5 {
+	m, ok := modelsRedis[name]
-			p := defaultDb.Password
+	if !ok {
-			l := len(p)
+		panic(errNoModelFound(name))
-			secDefaultDsn := strings.Replace(defaultDsn, p[2:l-3], "*****", 1)
+	}
-			log.Debugf("defaultDsn='%s'", secDefaultDsn)
+	return m.redisPool.Get()
-		}
+}
-
+
-		defaultOptions = append(defaultOptions, OptOpenDefaultDatabase)
+func RedisPool() *redis.Pool {
-	}
+	return RedisPoolOf(defaultRedisName)
-
+}
-	if defaultRds != nil {
+
-		// redis init
+func RedisPoolOf(name string) *redis.Pool {
-		defaultRds = defaultRds
+	m, ok := modelsRedis[name]
-		defaultRedisDebug = defaultRds.Debug
+	if !ok {
-		// redis debug
+		panic(errNoModelFound(name))
-		if defaultRedisDebug && len(defaultRds.Password) > 5 {
+	}
-			p := defaultRds.Password
+	return m.redisPool
-			l := len(p)
-			secDefaultRds := defaultRds
-			secDefaultRds.Password = strings.Replace(p, p[2:l-3], "*****", 1)
-			log.PrintPretty("defaultRds=", secDefaultRds)
-		}
-		defaultOptions = append(defaultOptions, OptOpenDefaultRedis)
-	}
 }