From ce0464bb18f35d0ada487133188389eac05b8354 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Sun, 4 Aug 2024 21:45:28 -0700 Subject: [PATCH] fix(verify): Include database engine in request Also print out more error info by default --- internal/cmd/verify.go | 3 +++ internal/dbmanager/client.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/internal/cmd/verify.go b/internal/cmd/verify.go index 37223b887e..a52c218bff 100644 --- a/internal/cmd/verify.go +++ b/internal/cmd/verify.go @@ -41,6 +41,7 @@ var verifyCmd = &cobra.Command{ Against: against, } if err := Verify(cmd.Context(), dir, name, opts); err != nil { + fmt.Fprintf(stderr, "Error verifying queries: %s\n", err) os.Exit(1) } return nil @@ -111,6 +112,7 @@ func Verify(ctx context.Context, dir, filename string, opts *Options) error { // Create (or re-use) a database to verify against resp, err := manager.CreateDatabase(ctx, &dbmanager.CreateDatabaseRequest{ + Engine: string(current.Engine), Migrations: ddl, }) if err != nil { @@ -144,6 +146,7 @@ func Verify(ctx context.Context, dir, filename string, opts *Options) error { if err := check(); err != nil { verr = errors.New("errored") fmt.Fprintf(stderr, "FAIL\t%s\n", qs.Name) + fmt.Fprintf(stderr, " ERROR\t%s\n", err) } else { fmt.Fprintf(stderr, "ok\t%s\n", qs.Name) } diff --git a/internal/dbmanager/client.go b/internal/dbmanager/client.go index 37bb051c8d..a999e4d803 100644 --- a/internal/dbmanager/client.go +++ b/internal/dbmanager/client.go @@ -62,7 +62,7 @@ func (m *ManagedClient) CreateDatabase(ctx context.Context, req *CreateDatabaseR case config.EnginePostgreSQL: // pass default: - return nil, fmt.Errorf("unsupported the %s engine", engine) + return nil, fmt.Errorf("unsupported engine: %s", engine) } var base string