fix(vet): report an error when a query is unpreparable, remove dead code

Author: andrewmbenton

internal/cmd/vet.go

@@ -15,7 +15,6 @@ import (
 
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/google/cel-go/cel"
-	"github.com/google/cel-go/common/types/ref"
 	"github.com/google/cel-go/ext"
 	"github.com/jackc/pgx/v5"
 	_ "github.com/mattn/go-sqlite3"
@@ -53,17 +52,6 @@ func NewCmdVet() *cobra.Command {
 	}
 }
 
-type emptyProgram struct {
-}
-
-func (e *emptyProgram) Eval(any) (ref.Val, *cel.EvalDetails, error) {
-	return nil, nil, fmt.Errorf("unimplemented")
-}
-
-func (e *emptyProgram) ContextEval(ctx context.Context, a any) (ref.Val, *cel.EvalDetails, error) {
-	return e.Eval(a)
-}
-
 func Vet(ctx context.Context, e Env, dir, filename string, stderr io.Writer) error {
 	configPath, conf, err := readConfig(stderr, dir, filename)
 	if err != nil {
@@ -99,9 +87,7 @@ func Vet(ctx context.Context, e Env, dir, filename string, stderr io.Writer) err
 		return fmt.Errorf("new env: %s", err)
 	}
 
-	checks := map[string]cel.Program{
-		RuleDbPrepare: &emptyProgram{},
-	}
+	checks := map[string]cel.Program{}
 	msgs := map[string]string{}
 
 	for _, c := range conf.Rules {
@@ -198,7 +184,8 @@ type dbPreparer struct {
 }
 
 func (p *dbPreparer) Prepare(ctx context.Context, name, query string) error {
-	_, err := p.db.PrepareContext(ctx, query)
+	s, err := p.db.PrepareContext(ctx, query)
+	s.Close()
 	return err
 }
 
@@ -316,12 +303,15 @@ func (c *checker) checkSQL(ctx context.Context, s config.SQL) error {
 					continue
 				}
 				original := result.Queries[i]
-				if prepareable(s, original.RawStmt) {
-					name := fmt.Sprintf("sqlc_vet_%d_%d", time.Now().Unix(), i)
-					if err := prep.Prepare(ctx, name, query.Text); err != nil {
-						fmt.Fprintf(c.Stderr, "%s: %s: %s: error preparing query: %s\n", query.Filename, q.Name, name, err)
-						errored = true
-					}
+				if !prepareable(s, original.RawStmt) {
+					fmt.Fprintf(c.Stderr, "%s: %s: %s: error preparing query: %s\n", query.Filename, q.Name, name, "query type is unpreparable")
+					errored = true
+					continue
+				}
+				name := fmt.Sprintf("sqlc_vet_%d_%d", time.Now().Unix(), i)
+				if err := prep.Prepare(ctx, name, query.Text); err != nil {
+					fmt.Fprintf(c.Stderr, "%s: %s: %s: error preparing query: %s\n", query.Filename, q.Name, name, err)
+					errored = true
 				}
 				continue
 			}