tests/golite.go: Close all leftover leakage so we can now drop InMemoryUnsae

2 files changed, 32 insertions, 33 deletions

diff --git a/src/golite.go b/src/golite.go
index 76e14f7..0229229 100644
--- a/src/golite.go
+++ b/src/golite.go
@@ -1053,9 +1053,8 @@ const (
 	columnTimestamp string = "timestamp"
 )
 
-const InMemoryUnsafe = ":memory:"
-const InMemory       = "file:mem?mode=memory&cache=shared"
-const DriverName     = "golite"
+const InMemory   = "file:mem?mode=memory&cache=shared"
+const DriverName = "golite"
 func init() {
 	sql.Register(DriverName, &SQLiteDriver{})
 }
diff --git a/tests/golite.go b/tests/golite.go
index 2e34c56..328c66c 100644
--- a/tests/golite.go
+++ b/tests/golite.go
@@ -1216,7 +1216,6 @@ func TestFTS5(t *testing.T) {
 	}
 	defer db.Close()
 
-	_, err = db.Exec("DROP TABLE foo")
 	_, err = db.Exec("CREATE VIRTUAL TABLE foo USING fts5(id, value)")
 	if err != nil {
 		t.Fatal("Failed to create table:", err)
@@ -1648,7 +1647,6 @@ func doTestOpen(t *testing.T, url string) (string, error) {
 		return "ping error:", err
 	}
 
-	_, err = db.Exec("drop table foo")
 	_, err = db.Exec("create table foo (id integer)")
 	if err != nil {
 		return "Failed to create table:", err
@@ -1811,7 +1809,6 @@ func TestClose(t *testing.T) {
 		t.Fatal("Failed to open database:", err)
 	}
 
-	_, err = db.Exec("drop table foo")
 	_, err = db.Exec("create table foo (id integer)")
 	if err != nil {
 		t.Fatal("Failed to create table:", err)
@@ -1836,7 +1833,6 @@ func TestInsert(t *testing.T) {
 	}
 	defer db.Close()
 
-	_, err = db.Exec("drop table foo")
 	_, err = db.Exec("create table foo (id integer)")
 	if err != nil {
 		t.Fatal("Failed to create table:", err)
@@ -1877,7 +1873,6 @@ func TestUpsert(t *testing.T) {
 	}
 	defer db.Close()
 
-	_, err = db.Exec("drop table foo")
 	_, err = db.Exec("create table foo (name string primary key, counter integer)")
 	if err != nil {
 		t.Fatal("Failed to create table:", err)
@@ -1920,7 +1915,6 @@ func TestUpdate(t *testing.T) {
 	}
 	defer db.Close()
 
-	_, err = db.Exec("drop table foo")
 	_, err = db.Exec("create table foo (id integer)")
 	if err != nil {
 		t.Fatal("Failed to create table:", err)
@@ -1983,7 +1977,6 @@ func TestDelete(t *testing.T) {
 	}
 	defer db.Close()
 
-	_, err = db.Exec("drop table foo")
 	_, err = db.Exec("create table foo (id integer)")
 	if err != nil {
 		t.Fatal("Failed to create table:", err)
@@ -2042,7 +2035,6 @@ func TestBooleanRoundtrip(t *testing.T) {
 	}
 	defer db.Close()
 
-	_, err = db.Exec("DROP TABLE foo")
 	_, err = db.Exec("CREATE TABLE foo(id INTEGER, value BOOL)")
 	if err != nil {
 		t.Fatal("Failed to create table:", err)
@@ -2091,7 +2083,6 @@ func TestTimestamp(t *testing.T) {
 	}
 	defer db.Close()
 
-	_, err = db.Exec("DROP TABLE foo")
 	_, err = db.Exec("CREATE TABLE foo(id INTEGER, ts timeSTAMP, dt DATETIME)")
 	if err != nil {
 		t.Fatal("Failed to create table:", err)
@@ -2218,6 +2209,7 @@ func TestBoolean(t *testing.T) {
 	if err != nil {
 		t.Fatal("Unable to query foo table:", err)
 	}
+	defer rows.Close()
 	counter := 0
 
 	var id int
@@ -2242,6 +2234,7 @@ func TestBoolean(t *testing.T) {
 	if err != nil {
 		t.Fatal("Unable to query foo table:", err)
 	}
+	defer rows.Close()
 
 	counter = 0
 
@@ -2265,6 +2258,7 @@ func TestBoolean(t *testing.T) {
 	if err != nil {
 		t.Fatal("Unable to query foo table:", err)
 	}
+	defer rows.Close()
 
 	rows.Next()
 	err = rows.Scan(&id, &fbool)
@@ -2274,7 +2268,7 @@ func TestBoolean(t *testing.T) {
 }
 
 func TestFloat32(t *testing.T) {
-	db, err := sql.Open(DriverName, InMemoryUnsafe)
+	db, err := sql.Open(DriverName, InMemory)
 	if err != nil {
 		t.Fatal("Failed to open database:", err)
 	}
@@ -2294,6 +2288,7 @@ func TestFloat32(t *testing.T) {
 	if err != nil {
 		t.Fatal("Unable to query foo table:", err)
 	}
+	defer rows.Close()
 
 	if !rows.Next() {
 		t.Fatal("Unable to query results:", err)
@@ -2309,7 +2304,7 @@ func TestFloat32(t *testing.T) {
 }
 
 func TestNull(t *testing.T) {
-	db, err := sql.Open(DriverName, InMemoryUnsafe)
+	db, err := sql.Open(DriverName, InMemory)
 	if err != nil {
 		t.Fatal("Failed to open database:", err)
 	}
@@ -2319,6 +2314,7 @@ func TestNull(t *testing.T) {
 	if err != nil {
 		t.Fatal("Unable to query foo table:", err)
 	}
+	defer rows.Close()
 
 	if !rows.Next() {
 		t.Fatal("Unable to query results:", err)
@@ -2338,7 +2334,7 @@ func TestNull(t *testing.T) {
 }
 
 func TestTransaction(t *testing.T) {
-	db, err := sql.Open(DriverName, InMemoryUnsafe)
+	db, err := sql.Open(DriverName, InMemory)
 	if err != nil {
 		t.Fatal("Failed to open database:", err)
 	}
@@ -2363,6 +2359,7 @@ func TestTransaction(t *testing.T) {
 	if err != nil {
 		t.Fatal("Unable to query foo table:", err)
 	}
+	defer rows.Close()
 
 	err = tx.Rollback()
 	if err != nil {
@@ -2395,7 +2392,7 @@ func TestTransaction(t *testing.T) {
 }
 
 func TestWAL(t *testing.T) {
-	db, err := sql.Open(DriverName, InMemoryUnsafe)
+	db, err := sql.Open(DriverName, InMemory)
 	if err != nil {
 		t.Fatal("Failed to open database:", err)
 	}
@@ -2441,7 +2438,6 @@ func TestTimezoneConversion(t *testing.T) {
 		}
 		defer db.Close()
 
-		_, err = db.Exec("DROP TABLE foo")
 		_, err = db.Exec("CREATE TABLE foo(id INTEGER, ts TIMESTAMP, dt DATETIME)")
 		if err != nil {
 			t.Fatal("Failed to create table:", err)
@@ -2529,7 +2525,7 @@ func TestTimezoneConversion(t *testing.T) {
 // TODO: Execer & Queryer currently disabled
 // https://github.com/mattn/go-sqlite3/issues/82
 func TestExecer(t *testing.T) {
-	db, err := sql.Open(DriverName, InMemoryUnsafe)
+	db, err := sql.Open(DriverName, InMemory)
 	if err != nil {
 		t.Fatal("Failed to open database:", err)
 	}
@@ -2547,7 +2543,7 @@ func TestExecer(t *testing.T) {
 }
 
 func TestQueryer(t *testing.T) {
-	db, err := sql.Open(DriverName, InMemoryUnsafe)
+	db, err := sql.Open(DriverName, InMemory)
 	if err != nil {
 		t.Fatal("Failed to open database:", err)
 	}
@@ -2596,7 +2592,7 @@ func TestQueryer(t *testing.T) {
 }
 
 func TestStress(t *testing.T) {
-	db, err := sql.Open(DriverName, InMemoryUnsafe)
+	db, err := sql.Open(DriverName, InMemory)
 	if err != nil {
 		t.Fatal("Failed to open database:", err)
 	}
@@ -2701,7 +2697,7 @@ func TestVersion(t *testing.T) {
 }
 
 func TestStringContainingZero(t *testing.T) {
-	db, err := sql.Open(DriverName, InMemoryUnsafe)
+	db, err := sql.Open(DriverName, InMemory)
 	if err != nil {
 		t.Fatal("Failed to open database:", err)
 	}
@@ -2759,7 +2755,7 @@ func (t TimeStamp) Value() (driver.Value, error) {
 }
 
 func TestDateTimeNow(t *testing.T) {
-	db, err := sql.Open(DriverName, InMemoryUnsafe)
+	db, err := sql.Open(DriverName, InMemory)
 	if err != nil {
 		t.Fatal("Failed to open database:", err)
 	}
@@ -2793,7 +2789,7 @@ func TestAggregatorRegistration(t *testing.T) {
 			return conn.RegisterAggregator("customSum", customSum, true)
 		},
 	})
-	db, err := sql.Open("sqlite3_AggregatorRegistration", InMemoryUnsafe)
+	db, err := sql.Open("sqlite3_AggregatorRegistration", InMemory)
 	if err != nil {
 		t.Fatal("Failed to open database:", err)
 	}
@@ -2860,7 +2856,7 @@ func TestAggregatorRegistration_GenericReturn(t *testing.T) {
 			return conn.RegisterAggregator("mode", newMode, true)
 		},
 	})
-	db, err := sql.Open("sqlite3_AggregatorRegistration_GenericReturn", InMemoryUnsafe)
+	db, err := sql.Open("sqlite3_AggregatorRegistration_GenericReturn", InMemory)
 	if err != nil {
 		t.Fatal("Failed to open database:", err)
 	}
@@ -2917,7 +2913,7 @@ func TestCollationRegistration(t *testing.T) {
 		},
 	})
 
-	db, err := sql.Open("sqlite3_CollationRegistration", InMemoryUnsafe)
+	db, err := sql.Open("sqlite3_CollationRegistration", InMemory)
 	if err != nil {
 		t.Fatal("Failed to open database:", err)
 	}
@@ -3011,7 +3007,7 @@ func TestDeclTypes(t *testing.T) {
 
 	d := SQLiteDriver{}
 
-	conn, err := d.Open(InMemoryUnsafe)
+	conn, err := d.Open(InMemory)
 	if err != nil {
 		t.Fatal("Failed to begin transaction:", err)
 	}
@@ -3043,7 +3039,7 @@ func TestDeclTypes(t *testing.T) {
 }
 
 func TestPinger(t *testing.T) {
-	db, err := sql.Open(DriverName, InMemoryUnsafe)
+	db, err := sql.Open(DriverName, InMemory)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -3077,7 +3073,7 @@ func TestUpdateAndTransactionHooks(t *testing.T) {
 			return nil
 		},
 	})
-	db, err := sql.Open("sqlite3_UpdateHook", InMemoryUnsafe)
+	db, err := sql.Open("sqlite3_UpdateHook", InMemory)
 	if err != nil {
 		t.Fatal("Failed to open database:", err)
 	}
@@ -3154,7 +3150,7 @@ func TestSetFileControlInt(t *testing.T) {
 }
 
 func TestNonColumnString(t *testing.T) {
-	db, err := sql.Open(DriverName, InMemoryUnsafe)
+	db, err := sql.Open(DriverName, InMemory)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -3174,11 +3170,12 @@ func TestNonColumnString(t *testing.T) {
 }
 
 func TestNilAndEmptyBytes(t *testing.T) {
-	db, err := sql.Open(DriverName, InMemoryUnsafe)
+	db, err := sql.Open(DriverName, InMemory)
 	if err != nil {
 		t.Fatal(err)
 	}
 	defer db.Close()
+
 	actualNil := []byte("use this to use an actual nil not a reference to nil")
 	emptyBytes := []byte{}
 	for tsti, tst := range []struct {
@@ -3206,10 +3203,13 @@ func TestNilAndEmptyBytes(t *testing.T) {
 				t.Fatal(tst.name, err)
 			}
 		}
+
 		rows, err := db.Query(fmt.Sprintf("select txt from tbl%d", tsti))
 		if err != nil {
 			t.Fatal(tst.name, err)
 		}
+		defer rows.Close()
+
 		if !rows.Next() {
 			t.Fatal(tst.name, "no rows")
 		}
@@ -3225,11 +3225,12 @@ func TestNilAndEmptyBytes(t *testing.T) {
 		} else if !bytes.Equal(scanBytes, tst.expectedBytes) {
 			t.Errorf("%s: %#v != %#v", tst.name, scanBytes, tst.expectedBytes)
 		}
+		rows.Close()
 	}
 }
 
 func TestInsertNilByteSlice(t *testing.T) {
-	db, err := sql.Open(DriverName, InMemoryUnsafe)
+	db, err := sql.Open(DriverName, InMemory)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -3250,13 +3251,12 @@ func TestInsertNilByteSlice(t *testing.T) {
 func TestNamedParam(t *testing.T) {
 	tempFilename := TempFilename(t)
 	defer os.Remove(tempFilename)
-	db, err := sql.Open(DriverName, InMemoryUnsafe)
+	db, err := sql.Open(DriverName, InMemory)
 	if err != nil {
 		t.Fatal("Failed to open database:", err)
 	}
 	defer db.Close()
 
-	_, err = db.Exec("drop table foo")
 	_, err = db.Exec("create table foo (id integer, name text, amount integer)")
 	if err != nil {
 		t.Fatal("Failed to create table:", err)