Tests cleanup: close rows when done to avoid resource leak during testing

Author: peergynt

driver_test.go

@@ -212,6 +212,7 @@ func TestEmptyQuery(t *testing.T) {
 	runTests(t, dsn, func(dbt *DBTest) {
 		// just a comment, no query
 		rows := dbt.mustQuery("--")
+		defer rows.Close()
 		// will hang before #255
 		if rows.Next() {
 			dbt.Errorf("next on rows must be false")
@@ -248,6 +249,7 @@ func TestCRUD(t *testing.T) {
 		if id != 0 {
 			dbt.Fatalf("expected InsertId 0, got %d", id)
 		}
+		rows.Close()
 
 		// Read
 		rows = dbt.mustQuery("SELECT value FROM test")
@@ -263,6 +265,7 @@ func TestCRUD(t *testing.T) {
 		} else {
 			dbt.Error("no data")
 		}
+		rows.Close()
 
 		// Update
 		res = dbt.mustExec("UPDATE test SET value = ? WHERE value = ?", false, true)
@@ -288,6 +291,7 @@ func TestCRUD(t *testing.T) {
 		} else {
 			dbt.Error("no data")
 		}
+		rows.Close()
 
 		// Delete
 		res = dbt.mustExec("DELETE FROM test WHERE value = ?", false)
@@ -339,6 +343,7 @@ func TestMultiQuery(t *testing.T) {
 		// Read
 		var out int
 		rows := dbt.mustQuery("SELECT value FROM test WHERE id=1;")
+		defer rows.Close()
 		if rows.Next() {
 			rows.Scan(&out)
 			if 5 != out {
@@ -369,6 +374,7 @@ func TestInt(t *testing.T) {
 			dbt.mustExec("INSERT INTO test VALUES (?)", in)
 
 			rows = dbt.mustQuery("SELECT value FROM test")
+			defer rows.Close()
 			if rows.Next() {
 				rows.Scan(&out)
 				if in != out {
@@ -388,6 +394,7 @@ func TestInt(t *testing.T) {
 			dbt.mustExec("INSERT INTO test VALUES (?)", in)
 
 			rows = dbt.mustQuery("SELECT value FROM test")
+			defer rows.Close()
 			if rows.Next() {
 				rows.Scan(&out)
 				if in != out {
@@ -412,6 +419,7 @@ func TestFloat32(t *testing.T) {
 			dbt.mustExec("CREATE TABLE test (value " + v + ")")
 			dbt.mustExec("INSERT INTO test VALUES (?)", in)
 			rows = dbt.mustQuery("SELECT value FROM test")
+			defer rows.Close()
 			if rows.Next() {
 				rows.Scan(&out)
 				if in != out {
@@ -435,6 +443,7 @@ func TestFloat64(t *testing.T) {
 			dbt.mustExec("CREATE TABLE test (value " + v + ")")
 			dbt.mustExec("INSERT INTO test VALUES (42.23)")
 			rows = dbt.mustQuery("SELECT value FROM test")
+			defer rows.Close()
 			if rows.Next() {
 				rows.Scan(&out)
 				if expected != out {
@@ -458,6 +467,7 @@ func TestFloat64Placeholder(t *testing.T) {
 			dbt.mustExec("CREATE TABLE test (id int, value " + v + ")")
 			dbt.mustExec("INSERT INTO test VALUES (1, 42.23)")
 			rows = dbt.mustQuery("SELECT value FROM test WHERE id = ?", 1)
+			defer rows.Close()
 			if rows.Next() {
 				rows.Scan(&out)
 				if expected != out {
@@ -484,6 +494,7 @@ func TestString(t *testing.T) {
 			dbt.mustExec("INSERT INTO test VALUES (?)", in)
 
 			rows = dbt.mustQuery("SELECT value FROM test")
+			defer rows.Close()
 			if rows.Next() {
 				rows.Scan(&out)
 				if in != out {
@@ -524,6 +535,7 @@ func TestRawBytes(t *testing.T) {
 		v1 := []byte("aaa")
 		v2 := []byte("bbb")
 		rows := dbt.mustQuery("SELECT ?, ?", v1, v2)
+		defer rows.Close()
 		if rows.Next() {
 			var o1, o2 sql.RawBytes
 			if err := rows.Scan(&o1, &o2); err != nil {
@@ -564,6 +576,7 @@ func TestValuer(t *testing.T) {
 		dbt.mustExec("CREATE TABLE test (value VARCHAR(255)) CHARACTER SET utf8")
 		dbt.mustExec("INSERT INTO test VALUES (?)", in)
 		rows = dbt.mustQuery("SELECT value FROM test")
+		defer rows.Close()
 		if rows.Next() {
 			rows.Scan(&out)
 			if in.value != out {
@@ -884,6 +897,7 @@ func TestTimestampMicros(t *testing.T) {
 		dbt.mustExec("INSERT INTO test SET value0=?, value1=?, value6=?", f0, f1, f6)
 		var res0, res1, res6 string
 		rows := dbt.mustQuery("SELECT * FROM test")
+		defer rows.Close()
 		if !rows.Next() {
 			dbt.Errorf("test contained no selectable values")
 		}
@@ -1042,6 +1056,7 @@ func TestNULL(t *testing.T) {
 
 		var out interface{}
 		rows := dbt.mustQuery("SELECT * FROM test")
+		defer rows.Close()
 		if rows.Next() {
 			rows.Scan(&out)
 			if out != nil {
@@ -1466,7 +1481,6 @@ func TestCollation(t *testing.T) {
 func TestColumnsWithAlias(t *testing.T) {
 	runTests(t, dsn+"&columnsWithAlias=true", func(dbt *DBTest) {
 		rows := dbt.mustQuery("SELECT 1 AS A")
-		defer rows.Close()
 		cols, _ := rows.Columns()
 		if len(cols) != 1 {
 			t.Fatalf("expected 1 column, got %d", len(cols))
@@ -1484,6 +1498,7 @@ func TestColumnsWithAlias(t *testing.T) {
 		if cols[0] != "A.one" {
 			t.Fatalf("expected column name \"A.one\", got \"%s\"", cols[0])
 		}
+		rows.Close()
 	})
 }
 
@@ -1520,6 +1535,7 @@ func TestTimezoneConversion(t *testing.T) {
 
 		// Retrieve time from DB
 		rows := dbt.mustQuery("SELECT ts FROM test")
+		defer rows.Close()
 		if !rows.Next() {
 			dbt.Fatal("did not get any rows out")
 		}
@@ -2017,6 +2033,7 @@ func TestInterruptBySignal(t *testing.T) {
 				dbt.Errorf("expected val to be 42")
 			}
 		}
+		rows.Close()
 
 		// binary protocol
 		rows, err = dbt.db.Query("CALL test_signal(?)", 42)
@@ -2030,6 +2047,7 @@ func TestInterruptBySignal(t *testing.T) {
 				dbt.Errorf("expected val to be 42")
 			}
 		}
+		rows.Close()
 	})
 }