Skip to content

fix(vet): clean up unnecessary prepareable() func and a var name collision #2509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 24, 2023
Merged

fix(vet): clean up unnecessary prepareable() func and a var name collision #2509

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 2 additions & 37 deletions internal/cmd/vet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
"github.com/kyleconroy/sqlc/internal/opts"
"github.com/kyleconroy/sqlc/internal/plugin"
"github.com/kyleconroy/sqlc/internal/shfmt"
"github.com/kyleconroy/sqlc/internal/sql/ast"
)

var ErrFailedChecks = errors.New("failed checks")
Expand Down Expand Up @@ -157,35 +156,6 @@ func Vet(ctx context.Context, e Env, dir, filename string, stderr io.Writer) err
return nil
}

// Determine if a query can be prepared based on the engine and the statement
// type.
func prepareable(sql config.SQL, raw *ast.RawStmt) bool {
if sql.Engine == config.EnginePostgreSQL {
// TOOD: Add support for MERGE and VALUES stmts
switch raw.Stmt.(type) {
case *ast.DeleteStmt:
return true
case *ast.InsertStmt:
return true
case *ast.SelectStmt:
return true
case *ast.UpdateStmt:
return true
default:
return false
}
}
// Almost all statements in MySQL can be prepared, so I'm just going to assume they can be
// https://dev.mysql.com/doc/refman/8.0/en/sql-prepared-statements.html
if sql.Engine == config.EngineMySQL {
return true
}
if sql.Engine == config.EngineSQLite {
return true
}
return false
}

type preparer interface {
Prepare(context.Context, string, string) error
}
Expand Down Expand Up @@ -393,13 +363,8 @@ func (c *checker) checkSQL(ctx context.Context, s config.SQL) error {
errored = true
continue
}
if !prepareable(s, result.Queries[i].RawStmt) {
fmt.Fprintf(c.Stderr, "%s: %s: %s: error preparing query: %s\n", query.Filename, query.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 {
prepName := fmt.Sprintf("sqlc_vet_%d_%d", time.Now().Unix(), i)
if err := prep.Prepare(ctx, prepName, query.Text); err != nil {
fmt.Fprintf(c.Stderr, "%s: %s: %s: error preparing query: %s\n", query.Filename, query.Name, name, err)
errored = true
continue
Expand Down