feat: test goner/gorm and update

gone-io · Nov 23, 2024 · e8bff7e · e8bff7e
1 parent d3b6393
commit e8bff7e
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 65 deletions.
diff --git a/goner/gorm/clickhouse/conn.go b/goner/gorm/clickhouse/conn.go
@@ -23,24 +23,22 @@ type dial struct {
 	defaultTableEngineOpts       string `gone:"gorm.clickhouse.default-table-engine-opts,default="`
 }
 
-func (d *dial) AfterRevive() (err error) {
-	if d.Dialector != nil {
-		return gone.NewInnerError("gorm.mysql.dialer has been initialized", gone.StartError)
+func (d *dial) Apply(*gorm.Config) error {
+	if d.Dialector == nil {
+		d.Dialector = clickhouse.New(clickhouse.Config{
+			DriverName:                   d.driverName,
+			DSN:                          d.dsn,
+			DisableDatetimePrecision:     d.disableDatetimePrecision,
+			DontSupportRenameColumn:      d.dontSupportRenameColumn,
+			DontSupportColumnPrecision:   d.dontSupportColumnPrecision,
+			DontSupportEmptyDefaultValue: d.dontSupportEmptyDefaultValue,
+			SkipInitializeWithVersion:    d.skipInitializeWithVersion,
+			DefaultGranularity:           d.defaultGranularity,
+			DefaultCompression:           d.defaultCompression,
+			DefaultIndexType:             d.defaultIndexType,
+			DefaultTableEngineOpts:       d.defaultTableEngineOpts,
+		})
 	}
-
-	d.Dialector = clickhouse.New(clickhouse.Config{
-		DriverName:                   d.driverName,
-		DSN:                          d.dsn,
-		DisableDatetimePrecision:     d.disableDatetimePrecision,
-		DontSupportRenameColumn:      d.dontSupportRenameColumn,
-		DontSupportColumnPrecision:   d.dontSupportColumnPrecision,
-		DontSupportEmptyDefaultValue: d.dontSupportEmptyDefaultValue,
-		SkipInitializeWithVersion:    d.skipInitializeWithVersion,
-		DefaultGranularity:           d.defaultGranularity,
-		DefaultCompression:           d.defaultCompression,
-		DefaultIndexType:             d.defaultIndexType,
-		DefaultTableEngineOpts:       d.defaultTableEngineOpts,
-	})
 	return nil
 }
 

diff --git a/goner/gorm/mysql/conn.go b/goner/gorm/mysql/conn.go
@@ -29,27 +29,25 @@ type dial struct {
 	DontSupportDropConstraint bool `gone:"config,gorm.mysql.dont-support-drop-constraint"`
 }
 
-func (d *dial) AfterRevive() error {
-	if d.Dialector != nil {
-		return gone.NewInnerError("gorm.mysql.dialer has been initialized", gone.StartError)
+func (d *dial) Apply(*gorm.Config) error {
+	if d.Dialector == nil {
+		d.Dialector = mysql.New(mysql.Config{
+			DriverName:                    d.DriverName,
+			ServerVersion:                 d.ServerVersion,
+			DSN:                           d.DSN,
+			SkipInitializeWithVersion:     d.SkipInitializeWithVersion,
+			DefaultStringSize:             d.DefaultStringSize,
+			DefaultDatetimePrecision:      d.DefaultDatetimePrecision,
+			DisableWithReturning:          d.DisableWithReturning,
+			DisableDatetimePrecision:      d.DisableDatetimePrecision,
+			DontSupportRenameIndex:        d.DontSupportRenameIndex,
+			DontSupportRenameColumn:       d.DontSupportRenameColumn,
+			DontSupportForShareClause:     d.DontSupportForShareClause,
+			DontSupportNullAsDefaultValue: d.DontSupportNullAsDefaultValue,
+			DontSupportRenameColumnUnique: d.DontSupportRenameColumnUnique,
+			DontSupportDropConstraint:     d.DontSupportDropConstraint,
+		})
 	}
-
-	d.Dialector = mysql.New(mysql.Config{
-		DriverName:                    d.DriverName,
-		ServerVersion:                 d.ServerVersion,
-		DSN:                           d.DSN,
-		SkipInitializeWithVersion:     d.SkipInitializeWithVersion,
-		DefaultStringSize:             d.DefaultStringSize,
-		DefaultDatetimePrecision:      d.DefaultDatetimePrecision,
-		DisableWithReturning:          d.DisableWithReturning,
-		DisableDatetimePrecision:      d.DisableDatetimePrecision,
-		DontSupportRenameIndex:        d.DontSupportRenameIndex,
-		DontSupportRenameColumn:       d.DontSupportRenameColumn,
-		DontSupportForShareClause:     d.DontSupportForShareClause,
-		DontSupportNullAsDefaultValue: d.DontSupportNullAsDefaultValue,
-		DontSupportRenameColumnUnique: d.DontSupportRenameColumnUnique,
-		DontSupportDropConstraint:     d.DontSupportDropConstraint,
-	})
 	return nil
 }
 
@@ -58,6 +56,7 @@ func Priest(cemetery gone.Cemetery) error {
 	cemetery.Bury(
 		&dial{},
 		gone.IsDefault(new(gorm.Dialector)),
+		gone.Order1,
 	)
 	return nil
 }
diff --git a/goner/gorm/postgres/conn.go b/goner/gorm/postgres/conn.go
@@ -17,18 +17,16 @@ type dial struct {
 	withoutReturning     bool   `gone:"config,gorm.postgres.without-returning=default"`
 }
 
-func (d *dial) AfterRevive() (err error) {
-	if d.Dialector != nil {
-		return gone.NewInnerError("gorm.mysql.dialer has been initialized", gone.StartError)
+func (d *dial) Apply(*gorm.Config) error {
+	if d.Dialector == nil {
+		d.Dialector = postgres.New(postgres.Config{
+			DriverName:           d.driverName,
+			DSN:                  d.dsn,
+			WithoutReturning:     d.withoutReturning,
+			PreferSimpleProtocol: d.preferSimpleProtocol,
+			WithoutQuotingCheck:  d.withoutQuotingCheck,
+		})
 	}
-
-	d.Dialector = postgres.New(postgres.Config{
-		DriverName:           d.driverName,
-		DSN:                  d.dsn,
-		WithoutReturning:     d.withoutReturning,
-		PreferSimpleProtocol: d.preferSimpleProtocol,
-		WithoutQuotingCheck:  d.withoutQuotingCheck,
-	})
 	return nil
 }
 

diff --git a/goner/gorm/provider.go b/goner/gorm/provider.go
@@ -8,6 +8,8 @@ import (
 )
 
 func ProviderPriest(cemetery gone.Cemetery) error {
+	var gInstance *gorm.DB
+
 	return gone.NewProviderPriest(func(tagConf string, s struct {
 		dial   gorm.Dialector   `gone:"*"`
 		logger logger.Interface `gone:"*"`
@@ -56,6 +58,9 @@ func ProviderPriest(cemetery gone.Cemetery) error {
 		MaxOpen         int            `gone:"config,gorm.pool.max-open"`
 		ConnMaxLifetime *time.Duration `gone:"config,gorm.pool.conn-max-lifetime"`
 	}) (*gorm.DB, error) {
+		if gInstance != nil {
+			return gInstance, nil
+		}
 		g, err := gorm.Open(s.dial, &gorm.Config{
 			SkipDefaultTransaction:                   s.SkipDefaultTransaction,
 			FullSaveAssociations:                     s.FullSaveAssociations,
@@ -92,6 +97,7 @@ func ProviderPriest(cemetery gone.Cemetery) error {
 		if s.ConnMaxLifetime != nil {
 			db.SetConnMaxLifetime(*s.ConnMaxLifetime)
 		}
+		gInstance = g
 		return g, nil
 	})(cemetery)
 }
diff --git a/goner/gorm/sqlite/conn.go b/goner/gorm/sqlite/conn.go
@@ -14,15 +14,13 @@ type dial struct {
 	DSN        string `gone:"config,gorm.sqlite.dsn"`
 }
 
-func (d *dial) AfterRevive() error {
-	if d.Dialector != nil {
-		return gone.NewInnerError("gorm.mysql.dialer has been initialized", gone.StartError)
+func (d *dial) Apply(*gorm.Config) error {
+	if d.Dialector == nil {
+		d.Dialector = sqlite.New(sqlite.Config{
+			DriverName: d.DriverName,
+			DSN:        d.DSN,
+		})
 	}
-
-	d.Dialector = sqlite.New(sqlite.Config{
-		DriverName: d.DriverName,
-		DSN:        d.DSN,
-	})
 	return nil
 }
 

diff --git a/goner/gorm/sqlserver/conn.go b/goner/gorm/sqlserver/conn.go
@@ -15,16 +15,14 @@ type dial struct {
 	DefaultStringSize int    `gone:"config,gorm.sqlserver.default-string-size"`
 }
 
-func (d *dial) AfterRevive() error {
-	if d.Dialector != nil {
-		return gone.NewInnerError("gorm.mysql.dialer has been initialized", gone.StartError)
+func (d *dial) Apply(*gorm.Config) error {
+	if d.Dialector == nil {
+		d.Dialector = sqlserver.New(sqlserver.Config{
+			DriverName:        d.DriverName,
+			DSN:               d.DSN,
+			DefaultStringSize: d.DefaultStringSize,
+		})
 	}
-
-	d.Dialector = sqlserver.New(sqlserver.Config{
-		DriverName:        d.DriverName,
-		DSN:               d.DSN,
-		DefaultStringSize: d.DefaultStringSize,
-	})
 	return nil
 }