1 files changed, 53 insertions, 50 deletions
diff --git a/tests/q.go b/tests/q.go
index 6b9e422..3657a69 100644
--- a/tests/q.go
+++ b/tests/q.go
@@ -14,7 +14,7 @@ import (
 	"sync"
 	"time"
 
-	"acudego"
+	"golite"
 	"guuid"
 	g "gobang"
 )
@@ -29,12 +29,16 @@ func test_defaultPrefix() {
 	})
 }
 
+func test_tryRollback() {
+	// FIXME
+}
+
 func test_inTx() {
 	/*
 	// FIXME
 	g.TestStart("inTx()")
 
-	db, err := sql.Open("acude", ":memory:")
+	db, err := sql.Open(golite.DriverName, ":memory:")
 	g.TErrorIf(err)
 	defer db.Close()
 
@@ -59,24 +63,24 @@ func test_inTx() {
 func test_createTables() {
 	g.TestStart("createTables()")
 
-	db, err := sql.Open("acude", ":memory:")
+	db, err := sql.Open(golite.DriverName, ":memory:")
 	g.TErrorIf(err)
 	defer db.Close()
 
 
 	g.Testing("tables exist afterwards", func() {
-		tmpl := `
+		const tmpl_read = `
 			SELECT id FROM "%s_messages" LIMIT 1;
 		`
-		q := fmt.Sprintf(tmpl, defaultPrefix)
+		qRead := fmt.Sprintf(tmpl_read, defaultPrefix)
 
-		_, err := db.Exec(q)
+		_, err := db.Exec(qRead)
 		g.TErrorNil(err)
 
 		err = createTables(db, defaultPrefix)
 		g.TErrorIf(err)
 
-		_, err = db.Exec(q)
+		_, err = db.Exec(qRead)
 		g.TErrorIf(err)
 	})
 
@@ -98,7 +102,7 @@ func test_takeStmt() {
 		prefix     = defaultPrefix
 	)
 
-	db, err := sql.Open("acude", ":memory:")
+	db, err := sql.Open(golite.DriverName, ":memory:")
 	g.TErrorIf(err)
 	g.TErrorIf(createTables(db, prefix))
 
@@ -178,15 +182,13 @@ func test_publishStmt() {
 		}
 	)
 
-	db, err := sql.Open("acude", ":memory:")
+	db, err := sql.Open(golite.DriverName, ":memory:")
 	g.TErrorIf(err)
 	g.TErrorIf(createTables(db, prefix))
 
 	instanceID := os.Getpid()
 	publish, publishClose, publishErr := publishStmt(db, prefix, instanceID)
-	g.TErrorIf(g.SomeError(
-		publishErr,
-	))
+	g.TErrorIf(publishErr)
 	defer g.SomeFnError(
 		publishClose,
 		    db.Close,
@@ -233,8 +235,8 @@ func test_publishStmt() {
 		g.TAssertEqual(message1.payload, payload)
 
 		g.TAssertEqual(
-			err2.(acudego.Error).ExtendedCode,
-			acudego.ErrConstraintUnique,
+			err2.(golite.Error).ExtendedCode,
+			golite.ErrConstraintUnique,
 		)
 	})
 
@@ -265,7 +267,7 @@ func test_findStmt() {
 		}
 	)
 
-	db, err := sql.Open("acude", ":memory:")
+	db, err := sql.Open(golite.DriverName, ":memory:")
 	g.TErrorIf(err)
 	g.TErrorIf(createTables(db, prefix))
 
@@ -364,7 +366,7 @@ func test_nextStmt() {
 		}
 	)
 
-	db, err := sql.Open("acude", ":memory:")
+	db, err := sql.Open(golite.DriverName, ":memory:")
 	g.TErrorIf(err)
 	g.TErrorIf(createTables(db, prefix))
 
@@ -488,7 +490,7 @@ func test_messageEach() {
 		}
 	)
 
-	db, err := sql.Open("acude", ":memory:")
+	db, err := sql.Open(golite.DriverName, ":memory:")
 	g.TErrorIf(err)
 	g.TErrorIf(createTables(db, prefix))
 
@@ -650,7 +652,7 @@ func test_pendingStmt() {
 		}
 	)
 
-	db, err := sql.Open("acude", ":memory:")
+	db, err := sql.Open(golite.DriverName, ":memory:")
 	g.TErrorIf(err)
 	g.TErrorIf(createTables(db, prefix))
 
@@ -881,7 +883,7 @@ func test_commitStmt() {
 		}
 	)
 
-	db, err := sql.Open("acude", ":memory:")
+	db, err := sql.Open(golite.DriverName, ":memory:")
 	g.TErrorIf(err)
 	g.TErrorIf(createTables(db, prefix))
 
@@ -928,8 +930,8 @@ func test_commitStmt() {
 		err2 := cmt(consumer, messageID)
 		g.TErrorIf(err1)
 		g.TAssertEqual(
-			err2.(acudego.Error).ExtendedCode,
-			acudego.ErrConstraintUnique,
+			err2.(golite.Error).ExtendedCode,
+			golite.ErrConstraintUnique,
 		)
 	})
 
@@ -979,8 +981,8 @@ func test_commitStmt() {
 		err2 := cmt(consumer, messageID)
 		g.TErrorIf(err1)
 		g.TAssertEqual(
-			err2.(acudego.Error).ExtendedCode,
-			acudego.ErrConstraintUnique,
+			err2.(golite.Error).ExtendedCode,
+			golite.ErrConstraintUnique,
 		)
 	})
 
@@ -1033,7 +1035,7 @@ func test_toDeadStmt() {
 		}
 	)
 
-	db, err := sql.Open("acude", ":memory:")
+	db, err := sql.Open(golite.DriverName, ":memory:")
 	g.TErrorIf(err)
 	g.TErrorIf(createTables(db, prefix))
 
@@ -1083,8 +1085,8 @@ func test_toDeadStmt() {
 		err2 := asDead(consumer, messageID, guuid.New())
 		g.TErrorIf(err1)
 		g.TAssertEqual(
-			err2.(acudego.Error).ExtendedCode,
-			acudego.ErrConstraintUnique,
+			err2.(golite.Error).ExtendedCode,
+			golite.ErrConstraintUnique,
 		)
 	})
 
@@ -1097,8 +1099,8 @@ func test_toDeadStmt() {
 		err2 := asDead(consumer, messageID2, deadletterID)
 		g.TErrorIf(err1)
 		g.TAssertEqual(
-			err2.(acudego.Error).ExtendedCode,
-			acudego.ErrConstraintUnique,
+			err2.(golite.Error).ExtendedCode,
+			golite.ErrConstraintUnique,
 		)
 
 	})
@@ -1165,8 +1167,8 @@ func test_toDeadStmt() {
 		err2 := asDead(consumer, messageID, guuid.New())
 		g.TErrorIf(err1)
 		g.TAssertEqual(
-			err2.(acudego.Error).ExtendedCode,
-			acudego.ErrConstraintUnique,
+			err2.(golite.Error).ExtendedCode,
+			golite.ErrConstraintUnique,
 		)
 	})
 
@@ -1223,7 +1225,7 @@ func test_replayStmt() {
 		}
 	)
 
-	db, err := sql.Open("acude", ":memory:")
+	db, err := sql.Open(golite.DriverName, ":memory:")
 	g.TErrorIf(err)
 	g.TErrorIf(createTables(db, prefix))
 
@@ -1291,16 +1293,16 @@ func test_replayStmt() {
 		_, err2 := replay(deadletterID, guuid.New())
 		g.TErrorIf(err1)
 		g.TAssertEqual(
-			err2.(acudego.Error).ExtendedCode,
-			acudego.ErrConstraintUnique,
+			err2.(golite.Error).ExtendedCode,
+			golite.ErrConstraintUnique,
 		)
 	})
 
 	g.Testing("we cant replay non-existent messages", func() {
 		_, err := replay(guuid.New(), guuid.New())
 		g.TAssertEqual(
-			err.(acudego.Error).ExtendedCode,
-			acudego.ErrConstraintNotNull,
+			err.(golite.Error).ExtendedCode,
+			golite.ErrConstraintNotNull,
 		)
 	})
 
@@ -1353,7 +1355,7 @@ func test_oneDeadStmt() {
 		}
 	)
 
-	db, err := sql.Open("acude", ":memory:")
+	db, err := sql.Open(golite.DriverName, ":memory:")
 	g.TErrorIf(err)
 	g.TErrorIf(createTables(db, prefix))
 
@@ -1467,7 +1469,7 @@ func test_deadletterEach() {
 		}
 	)
 
-	db, err := sql.Open("acude", ":memory:")
+	db, err := sql.Open(golite.DriverName, ":memory:")
 	g.TErrorIf(err)
 	g.TErrorIf(createTables(db, prefix))
 
@@ -1641,7 +1643,7 @@ func test_allDeadStmt() {
 		}
 	)
 
-	db, err := sql.Open("acude", ":memory:")
+	db, err := sql.Open(golite.DriverName, ":memory:")
 	g.TErrorIf(err)
 	g.TErrorIf(createTables(db, prefix))
 
@@ -1794,7 +1796,7 @@ func test_sizeStmt() {
 		}
 	)
 
-	db, err := sql.Open("acude", ":memory:")
+	db, err := sql.Open(golite.DriverName, ":memory:")
 	g.TErrorIf(err)
 	g.TErrorIf(createTables(db, prefix))
 
@@ -1902,7 +1904,7 @@ func test_countStmt() {
 		}
 	)
 
-	db, err := sql.Open("acude", ":memory:")
+	db, err := sql.Open(golite.DriverName, ":memory:")
 	g.TErrorIf(err)
 	g.TErrorIf(createTables(db, prefix))
 
@@ -2030,7 +2032,7 @@ func test_hasDataStmt() {
 		}
 	)
 
-	db, err := sql.Open("acude", ":memory:")
+	db, err := sql.Open(golite.DriverName, ":memory:")
 	g.TErrorIf(err)
 	g.TErrorIf(createTables(db, prefix))
 
@@ -2157,7 +2159,7 @@ func test_initDB() {
 		}
 	)
 
-	db, err := sql.Open("acude", ":memory:")
+	db, err := sql.Open(golite.DriverName, ":memory:")
 	g.TErrorIf(err)
 	defer db.Close()
 
@@ -2254,7 +2256,7 @@ func test_initDB() {
 func test_queriesTclose() {
 	g.TestStart("queriesT.close()")
 
-	db, err := sql.Open("acude", ":memory:")
+	db, err := sql.Open(golite.DriverName, ":memory:")
 	g.TErrorIf(err)
 	defer db.Close()
 
@@ -3229,7 +3231,7 @@ func test_NewWithPrefix() {
 	g.TestStart("NewWithPrefix()")
 
 	g.Testing("we get an error with a bad prefix", func() {
-		db, err := sql.Open("acude", ":memory:")
+		db, err := sql.Open(golite.DriverName, ":memory:")
 		g.TErrorIf(err)
 		defer db.Close()
 
@@ -3238,7 +3240,7 @@ func test_NewWithPrefix() {
 	})
 
 	g.Testing("otherwise we have a queueT and no errors", func() {
-		db, err := sql.Open("acude", ":memory:")
+		db, err := sql.Open(golite.DriverName, ":memory:")
 		g.TErrorIf(err)
 		defer db.Close()
 
@@ -3254,7 +3256,7 @@ func test_New() {
 	g.TestStart("New()")
 
 	g.Testing("smoke test that we get a queueT", func() {
-		db, err := sql.Open("acude", ":memory:")
+		db, err := sql.Open(golite.DriverName, ":memory:")
 		g.TErrorIf(err)
 		defer db.Close()
 
@@ -3308,7 +3310,7 @@ func test_queueT_Publish() {
 		}
 	)
 
-	db, err := sql.Open("acude", ":memory:")
+	db, err := sql.Open(golite.DriverName, ":memory:")
 	g.TErrorIf(err)
 	defer db.Close()
 
@@ -5696,9 +5698,9 @@ func dumpQueries() {
 	for _, query := range queries {
 		q := query.fn(defaultPrefix)
 		fmt.Printf("\n-- %s.sql:", query.name)
-		fmt.Printf("\n--   write: %s\n", q.write)
-		fmt.Printf("\n--   read:  %s\n", q.read)
-		fmt.Printf("\n--   owner: %s\n", q.owner)
+		fmt.Printf("\n--   write:%s\n", q.write)
+		fmt.Printf("\n--    read:%s\n", q.read)
+		fmt.Printf("\n--   owner:%s\n", q.owner)
 	}
 }
 
@@ -5712,6 +5714,7 @@ func MainTest() {
 
 	g.Init()
 	test_defaultPrefix()
+	test_tryRollback()
 	test_inTx()
 	test_createTables()
 	test_takeStmt()