Pass *schema.Schema argument to Complete calls

xataio · Jan 15, 2024 · 7c8ebc7 · 7c8ebc7
1 parent a185e8c
commit 7c8ebc7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/pkg/migrations/op_alter_column.go b/pkg/migrations/op_alter_column.go
@@ -21,7 +21,7 @@ func (o *OpAlterColumn) Start(ctx context.Context, conn *sql.DB, stateSchema str
 func (o *OpAlterColumn) Complete(ctx context.Context, conn *sql.DB, s *schema.Schema) error {
 	op := o.innerOperation()
 
-	return op.Complete(ctx, conn)
+	return op.Complete(ctx, conn, s)
 }
 
 func (o *OpAlterColumn) Rollback(ctx context.Context, conn *sql.DB) error {

diff --git a/pkg/roll/execute.go b/pkg/roll/execute.go
@@ -98,9 +98,15 @@ func (m *Roll) Complete(ctx context.Context) error {
 		}
 	}
 
+	// read the current schema
+	schema, err := m.state.ReadSchema(ctx, m.schema)
+	if err != nil {
+		return fmt.Errorf("unable to read schema: %w", err)
+	}
+
 	// execute operations
 	for _, op := range migration.Operations {
-		err := op.Complete(ctx, m.pgConn)
+		err := op.Complete(ctx, m.pgConn, schema)
 		if err != nil {
 			return fmt.Errorf("unable to execute complete operation: %w", err)
 		}