Rewrite to create a connection and prepare queries in one call. Stmts is no longer exposed to the user. An init SQL is added to initialize a database before preparing queries.

simplesql_test/simplesql_test.go

@@ -6,7 +6,6 @@ import (
 	"testing"
 
 	ssql "git.simplesystems.tech/simplesystems/simple-sql"
-	"github.com/jmoiron/sqlx"
 	_ "github.com/mattn/go-sqlite3"
 )
 
@@ -18,42 +17,20 @@ type user struct {
 }
 
 func TestNew(t *testing.T) {
+	// SQL to create a test table and users
+	initSQL := `CREATE TABLE users(id INT, username VARCHAR);INSERT INTO users (id, username) VALUES (1, 'u1'), (2, 'u2');`
+
 	// Create in-memory db for test
-	db, err := sqlx.Open("sqlite3", "file:temp.db?mode=memory")
+	db, err := ssql.New(context.TODO(), "sqlite3", "file:temp.db?mode=memory", sqlQueries, initSQL)
 	if err != nil {
 		t.Fatalf("opening db: %v", err)
 	}
 	defer db.Close()
 
-	// Create table
-	if _, err := db.Exec("CREATE TABLE users(id INT, username VARCHAR)"); err != nil {
-		t.Fatalf("creating table: %v", err)
-	}
-
-	// Add users
-	if _, err := db.Exec("INSERT INTO users (id, username) VALUES (1, 'u1'), (2, 'u2')"); err != nil {
-		t.Fatalf("adding users: %v", err)
-	}
-
-	// Prepare statements
-	stmts, err := ssql.Prepare(context.TODO(), db, sqlQueries)
-	if err != nil {
-		t.Fatalf("preparing statements: %v", err)
-	}
-	defer stmts.Close()
-
-	if len(stmts) != 1 {
-		t.Errorf("expecting 1 statement, but got %d", len(stmts))
-	}
-
-	if _, ok := stmts["get_user"]; !ok {
-		t.Error("expecting get_user to be in stmts, but it is not")
-	}
-
 	// Get a user from the table, using the prepared statement
 	var res user
-	if err := stmts["get_user"].Get(&res, map[string]interface{}{"user_id": "2"}); err != nil {
-		t.Fatalf("getting users: %v", err)
+	if err := db.Get("get_user", &res, map[string]interface{}{"user_id": "2"}); err != nil {
+		t.Fatalf("getting user: %v", err)
 	}
 
 	if res.Username != "u2" {