Merge branch 'master' into ops_3124

stellar · Sep 24, 2024 · 26e9b5d · 26e9b5d
2 parents 844f847 + 6fbba33
commit 26e9b5d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/support/db/dbtest/db.go b/support/db/dbtest/db.go
@@ -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)