From abe2cf6355f7e6093837395aa8420d4c1c1eb92e Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Fri, 20 Oct 2023 11:42:49 -0700 Subject: [PATCH] fix(vet): Remove rollback statements from DDL --- internal/cmd/vet.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/cmd/vet.go b/internal/cmd/vet.go index 6013c5d40d..bb56c7de33 100644 --- a/internal/cmd/vet.go +++ b/internal/cmd/vet.go @@ -24,6 +24,7 @@ import ( "github.com/sqlc-dev/sqlc/internal/config" "github.com/sqlc-dev/sqlc/internal/debug" + "github.com/sqlc-dev/sqlc/internal/migrations" "github.com/sqlc-dev/sqlc/internal/opts" "github.com/sqlc-dev/sqlc/internal/plugin" "github.com/sqlc-dev/sqlc/internal/quickdb" @@ -414,7 +415,7 @@ func (c *checker) fetchDatabaseUri(ctx context.Context, s config.SQL) (string, f c.Client = client } - var migrations []string + var ddl []string files, err := sqlpath.Glob(s.Schema) if err != nil { return "", cleanup, err @@ -424,13 +425,13 @@ func (c *checker) fetchDatabaseUri(ctx context.Context, s config.SQL) (string, f if err != nil { return "", cleanup, fmt.Errorf("read file: %w", err) } - migrations = append(migrations, string(contents)) + ddl = append(ddl, migrations.RemoveRollbackStatements(string(contents))) } resp, err := c.Client.CreateEphemeralDatabase(ctx, &pb.CreateEphemeralDatabaseRequest{ Engine: "postgresql", Region: quickdb.GetClosestRegion(), - Migrations: migrations, + Migrations: ddl, }) if err != nil { return "", cleanup, fmt.Errorf("managed: create database: %w", err)