feature: add test

ecodeclub · Apr 3, 2023 · 49f77a3 · 49f77a3
1 parent fe22dba
commit 49f77a3
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 26 deletions.
diff --git a/internal/datasource/cluster/cluster_db.go b/internal/datasource/cluster/cluster_db.go
@@ -50,14 +50,14 @@ func (c *clusterDB) Exec(ctx context.Context, query datasource.Query) (sql.Resul
 }
 
 func (c *clusterDB) Close() error {
-	var resErrs []error
+	var err error
 	for name, inst := range c.masterSlavesDBs {
-		err := inst.Close()
-		if err != nil {
-			resErrs = append(resErrs, fmt.Errorf("DB name [%s] error: %w", name, err))
+		if er := inst.Close(); er != nil {
+			err = multierr.Combine(
+				err, fmt.Errorf("masterslave DB name [%s] error: %w", name, er))
 		}
 	}
-	return multierr.Combine(resErrs...)
+	return err
 }
 
 func NewClusterDB(ms map[string]*masterslave.MasterSlavesDB) datasource.DataSource {

diff --git a/internal/datasource/masterslave/master_slave_db.go b/internal/datasource/masterslave/master_slave_db.go
@@ -75,16 +75,17 @@ func NewMasterSlavesDB(master *sql.DB, opts ...MasterSlavesDBOption) *MasterSlav
 }
 
 func (m *MasterSlavesDB) Close() error {
-	var resErrs []error
-	if err := m.master.Close(); err != nil {
-		resErrs = append(resErrs, fmt.Errorf("master error: %w", err))
+	var err error
+	if er := m.master.Close(); er != nil {
+		err = multierr.Combine(
+			err, fmt.Errorf("master error: %w", er))
 	}
 	if m.slaves != nil {
-		if err := m.slaves.Close(); err != nil {
-			resErrs = append(resErrs, err)
+		if er := m.slaves.Close(); er != nil {
+			err = multierr.Combine(err, er)
 		}
 	}
-	return multierr.Combine(resErrs...)
+	return err
 }
 
 type MasterSlavesDBOption func(db *MasterSlavesDB)

diff --git a/internal/datasource/masterslave/slaves/dns/dns.go b/internal/datasource/masterslave/slaves/dns/dns.go
@@ -202,12 +202,12 @@ func (s *Slaves) Close() error {
 }
 
 func (s *Slaves) closeDB() error {
-	var resErrs []error
+	var err error
 	for _, inst := range s.slaves {
-		err := inst.Close()
-		if err != nil {
-			resErrs = append(resErrs, fmt.Errorf("slave DB name [%s] error: %w", inst.SlaveName, err))
+		if er := inst.Close(); er != nil {
+			err = multierr.Combine(
+				err, fmt.Errorf("slave DB name [%s] error: %w", inst.SlaveName, er))
 		}
 	}
-	return multierr.Combine(resErrs...)
+	return err
 }
diff --git a/internal/datasource/masterslave/slaves/roundrobin/roundrobin.go b/internal/datasource/masterslave/slaves/roundrobin/roundrobin.go
@@ -46,14 +46,14 @@ func (r *Slaves) Next(ctx context.Context) (slaves.Slave, error) {
 }
 
 func (r *Slaves) Close() error {
-	var resErrs []error
+	var err error
 	for _, inst := range r.slaves {
-		err := inst.Close()
-		if err != nil {
-			resErrs = append(resErrs, fmt.Errorf("slave DB name [%s] error: %w", inst.SlaveName, err))
+		if er := inst.Close(); er != nil {
+			err = multierr.Combine(
+				err, fmt.Errorf("slave DB name [%s] error: %w", inst.SlaveName, er))
 		}
 	}
-	return multierr.Combine(resErrs...)
+	return err
 }
 
 func NewSlaves(dbs ...*sql.DB) (*Slaves, error) {

diff --git a/internal/datasource/shardingsource/sharding_datasource.go b/internal/datasource/shardingsource/sharding_datasource.go
@@ -59,12 +59,12 @@ func NewShardingDataSource(m map[string]datasource.DataSource) datasource.DataSo
 }
 
 func (s *ShardingDataSource) Close() error {
-	var resErrs []error
+	var err error
 	for name, inst := range s.sources {
-		err := inst.Close()
-		if err != nil {
-			resErrs = append(resErrs, fmt.Errorf("source name [%s] error: %w", name, err))
+		if er := inst.Close(); er != nil {
+			err = multierr.Combine(
+				err, fmt.Errorf("source name [%s] error: %w", name, er))
 		}
 	}
-	return multierr.Combine(resErrs...)
+	return err
 }