update mygorm

go.mod

@@ -3,15 +3,15 @@ module qoobing.com/gomod/model
 go 1.19.2
 
 require (
-	qoobing.com/gomod/gorm v0.0.2
-	qoobing.com/gomod/log v1.4.0
-	qoobing.com/gomod/redis v1.3.8
+	qoobing.com/gomod/gorm v0.0.4
+	qoobing.com/gomod/log v1.4.2
+	qoobing.com/gomod/redis v1.3.9
 )
 
 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.9 // indirect
+	gorm.io/driver/postgres v1.5.11 // indirect
 	gorm.io/gorm v1.25.12 // indirect
 )
 

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

@@ -2,6 +2,7 @@ package model
 
 import (
 	"fmt"
+	"reflect"
 	"sync"
 
 	"qoobing.com/gomod/gorm"
@@ -10,11 +11,16 @@ import (
 )
 
 var (
-	instances          = map[string]instance{}
-	errNoModelFound    = errorsWrap("named model(%s) not found")
-	errModeAlreadyInit = errorsWrap("named model(%s) already initilized")
-	errOpenDBFailed    = errorsWrap("open database failed: %s")
-	errOpenRedisFailed = errorsWrap("open redis failed: %s")
+	modelsDb         = map[string]*modelDb{}
+	modelsRedis      = map[string]*modelRedis{}
+	defaultDbName    = ""
+	defaultRedisName = ""
+
+	errNoModelFound     = errorsWrap("named model(%s) not found")
+	errModeAlreadyInit  = errorsWrap("named model(%s) already initilized")
+	errOpenDBFailed     = errorsWrap("open database failed: %s")
+	errOpenRedisFailed  = errorsWrap("open redis failed: %s")
+	errUnknownModelType = errorsWrap("unknown model type: %s")
 )
 
 func errorsWrap(base string) func(...any) error {
@@ -23,154 +29,115 @@ func errorsWrap(base string) func(...any) error {
 	}
 }
 
-const (
-	tx_status_none     = 0
-	tx_status_doing    = 1
-	tx_status_commit   = 2
-	tx_status_rollback = 3
+type (
+	DbConfig     = gorm.Config
+	RedisConfig  = redis.Config
+	Configurable interface {
+		*DbConfig | *RedisConfig
+	}
 )
 
-type Model struct {
-	mu       sync.Mutex
-	dbCfg    *gorm.Config
-	redisCfg *redis.Config
-
-	db         *gorm.DB
-	dbTxStatus int
-	redis      redis.Conn
-	redisPool  *redis.Pool
-}
-
-func (m *Model) Begin() {
-	if m.DB() == nil {
-		panic("unreachable code, db is uninitialized")
-	} else if m.dbTxStatus != tx_status_none {
-		panic("unreachable code, begin transaction towice???")
-	} else {
-		m.dbTxStatus = tx_status_doing
-		m.db = m.db.Begin()
-	}
-}
-
-func (m *Model) Commit() error {
-	if m.DB() == nil {
-		panic("unreachable code, db is uninitialized")
-	} else if m.dbTxStatus != tx_status_doing {
-		return nil
-	} else if err := m.db.Commit().Error; err != nil {
-		m.dbTxStatus = tx_status_rollback
-		return err
-	} else {
-		m.dbTxStatus = tx_status_commit
-		return nil
-	}
-}
-
-func (m *Model) Close() {
-	if m.redis != nil {
-		m.redis.Close()
-	}
-	if m.db == nil {
-		m.dbTxStatus = tx_status_none
-	} else if m.dbTxStatus == tx_status_doing {
-		m.db.Rollback()
-		m.dbTxStatus = tx_status_rollback
-	}
-}
-
-func (m *Model) DB() *gorm.DB {
-	return m.db
-}
-
-func (m *Model) Redis() redis.Conn {
-	return m.redis
-}
-
-func (m *Model) RedisPool() *redis.Pool {
-	return m.redisPool
-}
-
-type instance struct {
-	db       *gorm.DB
-	dbCfg    *gorm.Config
-	redis    *redis.Pool
-	redisCfg *redis.Config
-}
-
-// OpenDefault open 'default' model
-func OpenDefault() (*Model, error) {
-	return Open("default")
-}
-
-// OpenDefault open named model, if err is nil, caller MUST call m.Close() in defer.
-func Open(name string) (m *Model, err error) {
-	// check initialize
-	cfg, ok := instances[name]
-	if !ok {
-		return nil, errNoModelFound(name)
+type (
+	modelDb struct {
+		mu    sync.Mutex
+		db    *gorm.DB
+		dbCfg *gorm.Config
 	}
 
-	// open redis
-	var rds redis.Conn
-	if cfg.redisCfg == nil {
-		// don't need to open redis
-	} else if cfg.redis != nil {
-		rds = cfg.redis.Get()
-	} else if cfg.redis = redis.NewPool(*cfg.redisCfg); cfg.redis == nil {
-		return nil, errOpenRedisFailed("new redis pool return nil")
-	} else {
-		rds = cfg.redis.Get()
+	modelRedis struct {
+		mu        sync.Mutex
+		redis     redis.Conn
+		redisCfg  *redis.Config
+		redisPool *redis.Pool
 	}
-	defer func() {
-		if m == nil && rds != nil {
-			rds.Close()
-		}
-	}()
-
-	// open db
-	var db *gorm.DB
-	if cfg.dbCfg == nil {
-		// don't need to open database
-	} else if cfg.db != nil {
-		db = gorm.NewSession(cfg.db)
-	} else if cfg.db, err = gorm.NewDB(*cfg.dbCfg); err != nil {
-		return nil, errOpenDBFailed(err)
-	} else {
-		db = gorm.NewSession(cfg.db)
-	}
-
-	// success
-	m = &Model{
-		dbCfg:     cfg.dbCfg,
-		redisCfg:  cfg.redisCfg,
-		db:        db,
-		redis:     rds,
-		redisPool: cfg.redis,
-	}
-	return m, nil
-}
-
-// Init init default database config & redis config
-func InitDefault(_defaultDb *gorm.Config, _defaultRds *redis.Config) error {
-	return Init("default", _defaultDb, _defaultRds)
-}
+)
 
 // Init init named database config & redis config
-func Init(name string, dbCfg *gorm.Config, rdsCfg *redis.Config) error {
-	_, ok := instances[name]
-	if ok {
-		return errModeAlreadyInit(name)
+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
 	}
-	instances[name] = instance{
-		dbCfg:    dbCfg,
-		redisCfg: rdsCfg,
+
+	if inCfgType == reflect.TypeOf(redisCfg) {
+		redisCfg = reflect.ValueOf(cfg).Interface().(*redis.Config)
+		_, ok := modelsRedis[name]
+		if ok {
+			return errModeAlreadyInit("redis:" + name)
+		}
+		redisPool := redis.NewPool(*redisCfg)
+		if redisPool == nil {
+			return errOpenRedisFailed("new redis pool return nil")
+		}
+		modelsRedis[name] = &modelRedis{
+			redisPool: redisPool,
+			redisCfg:  redisCfg,
+		}
+		if defaultRedisName == "" || (defaultRedisName != "" && name == "default") {
+			defaultRedisName = name
+		}
+		log.Infof("success init model(%s) database:%s", name, redisCfg.GetSecDsn())
+		return nil
 	}
-	if dbCfg != nil && dbCfg.Debug {
-		log.Infof("init model(%s) database:%s", name, gorm.GetSecDsn(dbCfg))
-	}
-	if rdsCfg != nil && rdsCfg.Debug {
-		log.Infof("init model(%s) redis:%s", name, redis.)
-	}
-	log.Infof("init model(%s) done", name)
-	return nil
+
+	log.Infof("failed init model(%s), unknown model type: %s", name, inCfgType.Name())
+	return errUnknownModelType(inCfgType.Name())
+}
+
+func Db() *gorm.DB {
+	return DbOf(defaultDbName)
+}
+
+func DbOf(name string) *gorm.DB {
+	m, ok := modelsDb[name]
+	if !ok {
+		panic(errNoModelFound(name))
+	}
+	return gorm.NewSession(m.db)
+}
+
+func Redis() redis.Conn {
+	return RedisOf(defaultRedisName)
+}
+
+func RedisOf(name string) redis.Conn {
+	m, ok := modelsRedis[name]
+	if !ok {
+		panic(errNoModelFound(name))
+	}
+	return m.redisPool.Get()
+}
+
+func RedisPool() *redis.Pool {
+	return RedisPoolOf(defaultRedisName)
+}
+
+func RedisPoolOf(name string) *redis.Pool {
+	m, ok := modelsRedis[name]
+	if !ok {
+		panic(errNoModelFound(name))
+	}
+	return m.redisPool
 }