Skip to content

fix(postgres): snapshot restore #3264

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
Aug 20, 2025
Merged

fix(postgres): snapshot restore #3264

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c521dc0
#3263 fix: Terminate existing connections to snapshot DB
ascheman Aug 19, 2025
240a2ee
#3263 fix: Drop existing DB only if it exists
ascheman Aug 19, 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
7 changes: 5 additions & 2 deletions modules/postgres/postgres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,11 @@ func (c *PostgresContainer) Restore(ctx context.Context, opts ...SnapshotOption)

// execute the commands to restore the snapshot, in order
return c.execCommandsSQL(ctx,
// Drop the entire database by connecting to the postgres global database
fmt.Sprintf(`DROP DATABASE "%s" with (FORCE)`, c.dbName),
// Terminate all connections to the template database explicitly as the forced drop below will sometimes
// not terminate them and then fail to drop the database.
fmt.Sprintf(`SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = '%s' AND pid <> pg_backend_pid()`, snapshotName),
// Drop the database if it exists
fmt.Sprintf(`DROP DATABASE IF EXISTS "%s" with (FORCE)`, c.dbName),
// Then restore the previous snapshot
fmt.Sprintf(`CREATE DATABASE "%s" WITH TEMPLATE "%s" OWNER "%s"`, c.dbName, snapshotName, c.user),
)
Expand Down
Loading