src/q.go: New() - manage *sql.DB handle internally

1 files changed, 10 insertions, 21 deletions

diff --git a/tests/q.go b/tests/q.go
index 3657a69..aadc0f2 100644
--- a/tests/q.go
+++ b/tests/q.go
@@ -3231,20 +3231,12 @@ func test_NewWithPrefix() {
 	g.TestStart("NewWithPrefix()")
 
 	g.Testing("we get an error with a bad prefix", func() {
-		db, err := sql.Open(golite.DriverName, ":memory:")
-		g.TErrorIf(err)
-		defer db.Close()
-
-		_, err = NewWithPrefix(db, "a bad prefix")
+		_, err := NewWithPrefix(":memory:", "a bad prefix")
 		g.TAssertEqual(err, g.ErrBadSQLTablePrefix)
 	})
 
 	g.Testing("otherwise we have a queueT and no errors", func() {
-		db, err := sql.Open(golite.DriverName, ":memory:")
-		g.TErrorIf(err)
-		defer db.Close()
-
-		queue, err := NewWithPrefix(db, "good")
+		queue, err := NewWithPrefix(":memory:", "good")
 		g.TErrorIf(err)
 		queue.Close()
 
@@ -3256,11 +3248,7 @@ func test_New() {
 	g.TestStart("New()")
 
 	g.Testing("smoke test that we get a queueT", func() {
-		db, err := sql.Open(golite.DriverName, ":memory:")
-		g.TErrorIf(err)
-		defer db.Close()
-
-		queue, err := New(db)
+		queue, err := New(":memory:")
 		g.TErrorIf(err)
 		queue.Close()
 
@@ -3310,11 +3298,7 @@ func test_queueT_Publish() {
 		}
 	)
 
-	db, err := sql.Open(golite.DriverName, ":memory:")
-	g.TErrorIf(err)
-	defer db.Close()
-
-	queue, err := New(db)
+	queue, err := New(":memory:")
 	g.TErrorIf(err)
 	defer queue.Close()
 
@@ -4365,7 +4349,12 @@ func test_queueT_Close() {
 			subscriptionsErr = errors.New("subscriptionsT{} error")
 			queriesErr       = errors.New("queriesT{} error")
 		)
+
+		db, err := sql.Open(golite.DriverName, ":memory:")
+		g.TErrorIf(err)
+
 		queue := queueT{
+			db:      db,
 			queries: queriesT{
 				close: func() error{
 					queriesCount++
@@ -4387,7 +4376,7 @@ func test_queueT_Close() {
 			},
 		}
 
-		err := queue.Close()
+		err = queue.Close()
 		g.TAssertEqual(err, g.WrapErrors(subscriptionsErr, queriesErr))
 		g.TAssertEqual(pingerCount,        1)
 		g.TAssertEqual(subscriptionsCount, 1)