Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into func_buffered
Browse files Browse the repository at this point in the history
  • Loading branch information
sreuland committed Sep 25, 2024
2 parents 68f7f43 + 6fbba33 commit adeaaf0
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions support/db/dbtest/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,11 @@ func checkReadOnly(t testing.TB, DSN string) {
if !rows.Next() {
_, err = tx.Exec("CREATE ROLE user_ro WITH LOGIN PASSWORD 'user_ro';")
if err != nil {
// Handle race condition by ignoring the error if it's a duplicate key violation
if pqErr, ok := err.(*pq.Error); ok && pqErr.Code == "23505" {
// Handle race condition by ignoring the error if it's a duplicate key violation or duplicate object error
if pqErr, ok := err.(*pq.Error); ok && (pqErr.Code == "23505" || pqErr.Code == "42710") {
return
} else if ok {
t.Logf("pq error code: %s", pqErr.Code)
}
}
require.NoError(t, err)
Expand Down

0 comments on commit adeaaf0

Please sign in to comment.