Merge pull request #151 from go-sql-driver/badconn

Return ErrBadConn for invalid connections

connection.go

@@ -99,7 +99,8 @@ func (mc *mysqlConn) handleParams() (err error) {
 
 func (mc *mysqlConn) Begin() (driver.Tx, error) {
 	if mc.netConn == nil {
-		return nil, errInvalidConn
+		errLog.Print(errInvalidConn)
+		return nil, driver.ErrBadConn
 	}
 	err := mc.exec("START TRANSACTION")
 	if err == nil {
@@ -125,7 +126,8 @@ func (mc *mysqlConn) Close() (err error) {
 
 func (mc *mysqlConn) Prepare(query string) (driver.Stmt, error) {
 	if mc.netConn == nil {
-		return nil, errInvalidConn
+		errLog.Print(errInvalidConn)
+		return nil, driver.ErrBadConn
 	}
 	// Send command
 	err := mc.writeCommandPacketStr(comStmtPrepare, query)
@@ -156,7 +158,8 @@ func (mc *mysqlConn) Prepare(query string) (driver.Stmt, error) {
 
 func (mc *mysqlConn) Exec(query string, args []driver.Value) (driver.Result, error) {
 	if mc.netConn == nil {
-		return nil, errInvalidConn
+		errLog.Print(errInvalidConn)
+		return nil, driver.ErrBadConn
 	}
 	if len(args) == 0 { // no args, fastpath
 		mc.affectedRows = 0
@@ -200,7 +203,8 @@ func (mc *mysqlConn) exec(query string) error {
 
 func (mc *mysqlConn) Query(query string, args []driver.Value) (driver.Rows, error) {
 	if mc.netConn == nil {
-		return nil, errInvalidConn
+		errLog.Print(errInvalidConn)
+		return nil, driver.ErrBadConn
 	}
 	if len(args) == 0 { // no args, fastpath
 		// Send command

driver_test.go

@@ -11,6 +11,7 @@ package mysql
 import (
 	"crypto/tls"
 	"database/sql"
+	"database/sql/driver"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -860,8 +861,8 @@ func TestReuseClosedConnection(t *testing.T) {
 		t.Skipf("MySQL-Server not running on %s", netAddr)
 	}
 
-	driver := &MySQLDriver{}
-	conn, err := driver.Open(dsn)
+	md := &MySQLDriver{}
+	conn, err := md.Open(dsn)
 	if err != nil {
 		t.Fatalf("Error connecting: %s", err.Error())
 	}
@@ -884,9 +885,9 @@ func TestReuseClosedConnection(t *testing.T) {
 		}
 	}()
 	_, err = stmt.Exec(nil)
-	if err != nil && err != errInvalidConn {
+	if err != nil && err != driver.ErrBadConn {
 		t.Errorf("Unexpected error '%s', expected '%s'",
-			err.Error(), errInvalidConn.Error())
+			err.Error(), driver.ErrBadConn.Error())
 	}
 }
 

statement.go

@@ -21,7 +21,8 @@ type mysqlStmt struct {
 
 func (stmt *mysqlStmt) Close() error {
 	if stmt.mc == nil || stmt.mc.netConn == nil {
-		return errInvalidConn
+		errLog.Print(errInvalidConn)
+		return driver.ErrBadConn
 	}
 
 	err := stmt.mc.writeCommandPacketUint32(comStmtClose, stmt.id)
@@ -35,7 +36,8 @@ func (stmt *mysqlStmt) NumInput() int {
 
 func (stmt *mysqlStmt) Exec(args []driver.Value) (driver.Result, error) {
 	if stmt.mc.netConn == nil {
-		return nil, errInvalidConn
+		errLog.Print(errInvalidConn)
+		return nil, driver.ErrBadConn
 	}
 	// Send command
 	err := stmt.writeExecutePacket(args)
@@ -74,7 +76,8 @@ func (stmt *mysqlStmt) Exec(args []driver.Value) (driver.Result, error) {
 
 func (stmt *mysqlStmt) Query(args []driver.Value) (driver.Rows, error) {
 	if stmt.mc.netConn == nil {
-		return nil, errInvalidConn
+		errLog.Print(errInvalidConn)
+		return nil, driver.ErrBadConn
 	}
 	// Send command
 	err := stmt.writeExecutePacket(args)