Improve SQL tests

Separate the tests for Squirrel and database/sql. Add tests for
database/sql/driver.

Author: owen-mc

go/ql/test/library-tests/semmle/go/frameworks/SQL/database-sql-driver.go

@@ -0,0 +1,29 @@
+package main
+
+import (
+	"context"
+	"database/sql/driver"
+)
+
+var (
+	driver1 string
+	driver2 string
+	driver3 string
+	driver4 string
+	driver5 string
+	driver6 string
+)
+
+func testDriver(ctx context.Context, execer driver.Execer,
+	execerContext driver.ExecerContext,
+	conn driver.Conn,
+	connContext driver.ConnPrepareContext,
+	queryer driver.Queryer,
+	queryerContext driver.QueryerContext) {
+	execer.Exec(driver1, nil)                      // $ query=driver1
+	execerContext.ExecContext(ctx, driver2, nil)   // $ query=driver2
+	conn.Prepare(driver3)                          // $ querystring=driver3
+	connContext.PrepareContext(ctx, driver4)       // $ querystring=driver4
+	queryer.Query(driver5, nil)                    // $ query=driver5
+	queryerContext.QueryContext(ctx, driver6, nil) // $ query=driver6
+}

go/ql/test/library-tests/semmle/go/frameworks/SQL/database-sql.go

@@ -0,0 +1,67 @@
+package main
+
+//go:generate depstubber -vendor github.com/Masterminds/squirrel DeleteBuilder,InsertBuilder,SelectBuilder,UpdateBuilder Delete,Expr,Insert,Select,Update
+
+import (
+	"context"
+	"database/sql"
+)
+
+var (
+	query1  string
+	query2  string
+	query3  string
+	query4  string
+	query5  string
+	query6  string
+	query7  string
+	query8  string
+	query11 string
+	query12 string
+	query13 string
+	query14 string
+	query15 string
+	query16 string
+	query17 string
+	query18 string
+	query21 string
+	query22 string
+	query23 string
+)
+
+func test(db *sql.DB, ctx context.Context) {
+	db.Exec(query1)                 // $ query=query1
+	db.ExecContext(ctx, query2)     // $ query=query2
+	db.Prepare(query3)              // $ querystring=query3
+	db.PrepareContext(ctx, query4)  // $ querystring=query4
+	db.Query(query5)                // $ query=query5
+	db.QueryContext(ctx, query6)    // $ query=query6
+	db.QueryRow(query7)             // $ query=query7
+	db.QueryRowContext(ctx, query8) // $ query=query8
+}
+
+func test2(tx *sql.Tx, query string, ctx context.Context) {
+	tx.Exec(query11)                 // $ query=query11
+	tx.ExecContext(ctx, query12)     // $ query=query12
+	tx.Prepare(query13)              // $ querystring=query13
+	tx.PrepareContext(ctx, query14)  // $ querystring=query14
+	tx.Query(query15)                // $ query=query15
+	tx.QueryContext(ctx, query16)    // $ query=query16
+	tx.QueryRow(query17)             // $ query=query17
+	tx.QueryRowContext(ctx, query18) // $ query=query18
+}
+
+func test3(db *sql.DB, ctx context.Context) {
+	stmt1, _ := db.Prepare(query21)             // $ SPURIOUS: querystring=query21
+	stmt1.Exec()                                // $ MISSING: query=query21
+	stmt2, _ := db.PrepareContext(ctx, query22) // $ SPURIOUS: querystring=query22
+	stmt2.ExecContext(ctx)                      // $ MISSING: query=query22
+	stmt3, _ := db.Prepare(query23)             // $ SPURIOUS: querystring=query23
+	runQuery(stmt3)
+}
+
+func runQuery(stmt *sql.Stmt) {
+	stmt.Exec() // $ MISSING: query=query23
+}
+
+func main() {}

go/ql/test/library-tests/semmle/go/frameworks/SQL/main.go renamed to go/ql/test/library-tests/semmle/go/frameworks/SQL/squirrel.go

@@ -3,45 +3,9 @@ package main
 //go:generate depstubber -vendor github.com/Masterminds/squirrel DeleteBuilder,InsertBuilder,SelectBuilder,UpdateBuilder Delete,Expr,Insert,Select,Update
 
 import (
-	"context"
-	"database/sql"
-
 	"github.com/Masterminds/squirrel"
 )
 
-var (
-	query1  string
-	query2  string
-	query3  string
-	query4  string
-	query5  string
-	query6  string
-	query7  string
-	query8  string
-	query11 string
-	query12 string
-	query13 string
-	query14 string
-	query15 string
-	query16 string
-	query17 string
-	query18 string
-	query21 string
-	query22 string
-	query23 string
-)
-
-func test(db *sql.DB, ctx context.Context) {
-	db.Exec(query1)                 // $ query=query1
-	db.ExecContext(ctx, query2)     // $ query=query2
-	db.Prepare(query3)              // $ querystring=query3
-	db.PrepareContext(ctx, query4)  // $ querystring=query4
-	db.Query(query5)                // $ query=query5
-	db.QueryContext(ctx, query6)    // $ query=query6
-	db.QueryRow(query7)             // $ query=query7
-	db.QueryRowContext(ctx, query8) // $ query=query8
-}
-
 func squirrelTest(querypart string) {
 	squirrel.Expr(querypart)                    // $ querystring=querypart
 	deleteBuilder := squirrel.Delete(querypart) // $ querystring=querypart
@@ -81,29 +45,3 @@ func squirrelTest(querypart string) {
 	updateBuilder.Set(querypart, "")            // $ querystring=querypart
 	updateBuilder.Table(querypart)              // $ querystring=querypart
 }
-
-func test2(tx *sql.Tx, query string, ctx context.Context) {
-	tx.Exec(query11)                 // $ query=query11
-	tx.ExecContext(ctx, query12)     // $ query=query12
-	tx.Prepare(query13)              // $ querystring=query13
-	tx.PrepareContext(ctx, query14)  // $ querystring=query14
-	tx.Query(query15)                // $ query=query15
-	tx.QueryContext(ctx, query16)    // $ query=query16
-	tx.QueryRow(query17)             // $ query=query17
-	tx.QueryRowContext(ctx, query18) // $ query=query18
-}
-
-func test3(db *sql.DB, ctx context.Context) {
-	stmt1, _ := db.Prepare(query21)             // $ SPURIOUS: querystring=query21
-	stmt1.Exec()                                // $ MISSING: query=query21
-	stmt2, _ := db.PrepareContext(ctx, query22) // $ SPURIOUS: querystring=query22
-	stmt2.ExecContext(ctx)                      // $ MISSING: query=query22
-	stmt3, _ := db.Prepare(query23)             // $ SPURIOUS: querystring=query23
-	runQuery(stmt3)
-}
-
-func runQuery(stmt *sql.Stmt) {
-	stmt.Exec() // $ MISSING: query=query23
-}
-
-func main() {}