Skip to content

Commit 21cc9fc

Browse files
authored
Merge pull request jackc#2506 from JelteF/skip-standard-conforming-strings
Skip standard_conforming_strings=off on PG19
2 parents 0be0344 + f8eb0d0 commit 21cc9fc

2 files changed

Lines changed: 19 additions & 0 deletions

File tree

pgxtest/pgxtest.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,3 +171,21 @@ func SkipPostgreSQLVersionLessThan(t testing.TB, conn *pgx.Conn, minVersion int6
171171
t.Skipf("Test requires PostgreSQL v%d+", minVersion)
172172
}
173173
}
174+
175+
func SkipPostgreSQLVersionGreaterThan(t testing.TB, conn *pgx.Conn, maxVersion int64) {
176+
serverVersionStr := conn.PgConn().ParameterStatus("server_version")
177+
serverVersionStr = regexp.MustCompile(`^[0-9]+`).FindString(serverVersionStr)
178+
// if not PostgreSQL do nothing
179+
if serverVersionStr == "" {
180+
return
181+
}
182+
183+
serverVersion, err := strconv.ParseInt(serverVersionStr, 10, 64)
184+
if err != nil {
185+
t.Fatalf("postgres version parsed failed: %s", err)
186+
}
187+
188+
if serverVersion > maxVersion {
189+
t.Skipf("Test requires PostgreSQL v%d or lower", maxVersion)
190+
}
191+
}

query_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2033,6 +2033,7 @@ func TestConnSimpleProtocolRefusesNonStandardConformingStrings(t *testing.T) {
20332033
defer closeConn(t, conn)
20342034

20352035
pgxtest.SkipCockroachDB(t, conn, "Server does not support standard_conforming_strings = off (https://github.com/cockroachdb/cockroach/issues/36215)")
2036+
pgxtest.SkipPostgreSQLVersionGreaterThan(t, conn, 18) // PG19 stopped supporting standard_conforming_strings = off
20362037

20372038
mustExec(t, conn, "set standard_conforming_strings to off")
20382039

0 commit comments

Comments
 (0)