Skip to content

Commit

Permalink
Return an error on failures (#3427)
Browse files Browse the repository at this point in the history
  • Loading branch information
kyleconroy committed Jun 6, 2024
1 parent b58760b commit fcbd84a
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions internal/cmd/verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package cmd
import (
"context"
"database/sql"
"errors"
"fmt"
"log/slog"
"os"
Expand Down Expand Up @@ -75,6 +76,7 @@ func Verify(ctx context.Context, dir, filename string, opts *Options) error {
existing[qs.Name] = qs
}

var verr error
for _, qs := range previous.QuerySets {
// TODO: Create a function for this so that we can return early on errors

Expand Down Expand Up @@ -121,30 +123,31 @@ func Verify(ctx context.Context, dir, filename string, opts *Options) error {
}
defer db.Close()

var qerr error
for _, query := range codegen.Queries {
stmt, err := db.PrepareContext(ctx, query.Text)
if err != nil {
fmt.Fprintf(stderr, "Failed to prepare the following query:\n")
fmt.Fprintf(stderr, "%s\n", query.Text)
fmt.Fprintf(stderr, "Error was: %s\n", err)
qerr = err
continue
}
if err := stmt.Close(); err != nil {
slog.Error("stmt.Close failed", "err", err)
}
}

return nil
return qerr
}

if err := check(); err != nil {
verr = errors.New("errored")
fmt.Fprintf(stderr, "FAIL\t%s\n", qs.Name)
} else {
fmt.Fprintf(stderr, "ok\t%s\n", qs.Name)
}
}

// return fmt.Errorf("BREAKING CHANGES DETECTED")

return nil
return verr
}

0 comments on commit fcbd84a

Please sign in to comment.