Merge pull request golang-migrate#287 from ctuong/pg-lock-comment

dhui · web-flow · commit fc060940b49c · 2019-09-25T00:57:45.000-07:00
Update postgres driver Lock comment to reflect actual behavior
diff --git a/database/postgres/postgres.go b/database/postgres/postgres.go
@@ -150,8 +150,7 @@ func (p *Postgres) Lock() error {
 		return err
 	}
 
-	// This will either obtain the lock immediately and return true,
-	// or return false if the lock cannot be acquired immediately.
+	// This will wait indefinitely until the lock can be acquired.
 	query := `SELECT pg_advisory_lock($1)`
 	if _, err := p.conn.ExecContext(context.Background(), query, aid); err != nil {
 		return &database.Error{OrigErr: err, Err: "try lock failed", Query: []byte(query)}

Original file line number	Diff line number	Diff line change
`@@ -150,8 +150,7 @@ func (p *Postgres) Lock() error {`
`150`	`150`	`return err`
`151`	`151`	`}`
`152`	`152`
`153`		`- // This will either obtain the lock immediately and return true,`
`154`		`- // or return false if the lock cannot be acquired immediately.`
	`153`	`+ // This will wait indefinitely until the lock can be acquired.`
`155`	`154`	query := `SELECT pg_advisory_lock($1)`
`156`	`155`	`if _, err := p.conn.ExecContext(context.Background(), query, aid); err != nil {`
`157`	`156`	`return &database.Error{OrigErr: err, Err: "try lock failed", Query: []byte(query)}`