fix: custom drivers report error on cleanup (#102)

GoogleCloudPlatform · Feb 8, 2022 · 648b75a · 648b75a
1 parent 901f0fa
commit 648b75a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/mysql/mysql/mysql.go b/mysql/mysql/mysql.go
@@ -41,10 +41,7 @@ func RegisterDriver(name string, opts ...cloudsqlconn.Option) (func() error, err
 	sql.Register(name, &mysqlDriver{
 		d: &mysql.MySQLDriver{},
 	})
-	return func() error {
-		d.Close()
-		return nil
-	}, nil
+	return func() error { return d.Close() }, nil
 }
 
 type mysqlDriver struct {

diff --git a/postgres/pgxv4/postgres.go b/postgres/pgxv4/postgres.go
@@ -41,10 +41,7 @@ func RegisterDriver(name string, opts ...cloudsqlconn.Option) (func() error, err
 	sql.Register(name, &pgDriver{
 		d: d,
 	})
-	return func() error {
-		d.Close()
-		return nil
-	}, nil
+	return func() error { return d.Close() }, nil
 }
 
 type pgDriver struct {

diff --git a/sqlserver/mssql/mssql.go b/sqlserver/mssql/mssql.go
@@ -39,10 +39,7 @@ func RegisterDriver(name string, opts ...cloudsqlconn.Option) (func() error, err
 	sql.Register(name, &sqlserverDriver{
 		d: d,
 	})
-	return func() error {
-		d.Close()
-		return nil
-	}, nil
+	return func() error { return d.Close() }, nil
 }
 
 type csqlDialer struct {