Use Postgres.conn rather than Postgres.db to handle table locking #3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bclarkx2
commented
Jan 30, 2024
| @@ -370,7 +370,7 @@ func (p *Postgres) releaseTableLock() error { | |||
| } | |||
|
|
|||
| query := "DELETE FROM " + pq.QuoteIdentifier(p.config.LockTable) + " WHERE lock_id = $1" | |||
| if _, err := p.db.Exec(query, aid); err != nil { | |||
| if _, err := p.conn.ExecContext(context.Background(), query, aid); err != nil { | |||
There was a problem hiding this comment.
I didn't change these functions to accept a context just because I didn't want to deviate too far from the current behavior in which these queries are not cancellable, mostly on the grounds that I'm not super familiar with the ramifications of making them cancellable.
If you or the upstream maintainers would prefer that these functions accept a context rather than use the background context, I'd be happy to make that change!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#2 makes it so that
WithInstancein thepgxdatabase driver simply grabs a connection from the pool and callsWithConnectionon it.However, golang-migrate#992 has added the ability to configure the
pgxdriver to use either advisory or table locks to lock the database for migrations.This PR updates the functions that acquire and release those table locks to use
Postgres.connrather thanPostgres.db, as following the changes in #2 allPostgresinstances will haveconnset but those instantiated withWithConnectionmay not havedbset.