Skip to content

Commit fcbd84a

Browse files
authored
Return an error on failures (#3427)
1 parent b58760b commit fcbd84a

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

internal/cmd/verify.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package cmd
33
import (
44
"context"
55
"database/sql"
6+
"errors"
67
"fmt"
78
"log/slog"
89
"os"
@@ -75,6 +76,7 @@ func Verify(ctx context.Context, dir, filename string, opts *Options) error {
7576
existing[qs.Name] = qs
7677
}
7778

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

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

126+
var qerr error
124127
for _, query := range codegen.Queries {
125128
stmt, err := db.PrepareContext(ctx, query.Text)
126129
if err != nil {
127130
fmt.Fprintf(stderr, "Failed to prepare the following query:\n")
128131
fmt.Fprintf(stderr, "%s\n", query.Text)
129132
fmt.Fprintf(stderr, "Error was: %s\n", err)
133+
qerr = err
130134
continue
131135
}
132136
if err := stmt.Close(); err != nil {
133137
slog.Error("stmt.Close failed", "err", err)
134138
}
135139
}
136140

137-
return nil
141+
return qerr
138142
}
139143

140144
if err := check(); err != nil {
145+
verr = errors.New("errored")
141146
fmt.Fprintf(stderr, "FAIL\t%s\n", qs.Name)
142147
} else {
143148
fmt.Fprintf(stderr, "ok\t%s\n", qs.Name)
144149
}
145150
}
146151

147-
// return fmt.Errorf("BREAKING CHANGES DETECTED")
148-
149-
return nil
152+
return verr
150153
}

0 commit comments

Comments
 (0)