Merge pull request #16 from secondwindoss/fix/910-connectcontext-close

Close the DB in ConnectContext when the ping fails (upstream #561).

Author: avgvi

connect_context_test.go

@@ -0,0 +1,21 @@
+package sqlx
+
+import (
+	"context"
+	"testing"
+)
+
+// ConnectContext closes the DB and returns nil when the ping fails
+// (upstream #910).
+func TestConnectContextClosesOnPingFailure(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	cancel()
+	db, err := ConnectContext(ctx, "sqlite3", ":memory:")
+	if err == nil {
+		t.Fatal("expected a ping error with a cancelled context")
+	}
+	if db != nil {
+		t.Errorf("ConnectContext returned a non-nil *DB together with the error: %v", err)
+		db.Close()
+	}
+}

sqlx.go

@@ -1,6 +1,7 @@
 package sqlx
 
 import (
+	"context"
 	"database/sql"
 	"database/sql/driver"
 	"errors"
@@ -638,16 +639,7 @@ func (r *Rows) StructScan(dest interface{}) error {
 
 // Connect to a database and verify with a ping.
 func Connect(driverName, dataSourceName string) (*DB, error) {
-	db, err := Open(driverName, dataSourceName)
-	if err != nil {
-		return nil, err
-	}
-	err = db.Ping()
-	if err != nil {
-		db.Close()
-		return nil, err
-	}
-	return db, nil
+	return ConnectContext(context.Background(), driverName, dataSourceName)
 }
 
 // MustConnect connects to a database and panics on error.

sqlx_context.go

@@ -19,7 +19,11 @@ func ConnectContext(ctx context.Context, driverName, dataSourceName string) (*DB
 		return db, err
 	}
 	err = db.PingContext(ctx)
-	return db, err
+	if err != nil {
+		db.Close()
+		return nil, err
+	}
+	return db, nil
 }
 
 // QueryerContext is an interface used by GetContext and SelectContext