Skip to content

fix: 2nd pass when pulling initial schema #4357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 24, 2025
Merged

fix: 2nd pass when pulling initial schema #4357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6eb9642
fix: 2nd pass when pulling initial schema
sweatybridge Oct 24, 2025
d8245d7
chore: deprecate reset all from dump script
sweatybridge Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions internal/db/pull/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@ import (
)

var (
errMissing = errors.New("No migrations found")
errInSync = errors.New("No schema changes found")
errConflict = errors.Errorf("The remote database's migration history does not match local files in %s directory.", utils.MigrationsDir)
managedSchemas = []string{"auth", "storage", "realtime"}
errMissing = errors.New("No migrations found")
errInSync = errors.New("No schema changes found")
errConflict = errors.Errorf("The remote database's migration history does not match local files in %s directory.", utils.MigrationsDir)
)

func Run(ctx context.Context, schema []string, config pgconn.Config, name string, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error {
Expand Down Expand Up @@ -61,8 +60,8 @@ func run(ctx context.Context, schema []string, path string, conn *pgx.Conn, fsys
if err = dumpRemoteSchema(ctx, path, config, fsys); err != nil {
return err
}
// Pull changes in managed schemas automatically
if err = diffRemoteSchema(ctx, managedSchemas, path, config, fsys); errors.Is(err, errInSync) {
// Run a second pass to pull in changes from default privileges and managed schemas
if err = diffRemoteSchema(ctx, nil, path, config, fsys); errors.Is(err, errInSync) {
err = nil
}
return err
Expand Down
3 changes: 0 additions & 3 deletions pkg/migration/scripts/dump_schema.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,3 @@ pg_dump \
| sed -E 's/^ALTER TABLE "cron"/-- &/' \
| sed -E 's/^SET transaction_timeout = 0;/-- &/' \
| sed -E "${EXTRA_SED:-}"

# Reset session config generated by pg_dump
echo "RESET ALL;"
Loading