GOMODULES
/
pgx
mirror of https://github.com/jackc/pgx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify CockroachDB detection

pull/955/head
Jack Christensen 2021-02-27 10:40:06 -06:00
parent 09371f21d0
commit 1dc7133a63
8 changed files with 31 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
batch_test.go
View File

@ -18,9 +18,7 @@ func TestConnSendBatch(t *testing.T) {
conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE")) conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
defer closeConn(t, conn) defer closeConn(t, conn)
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Server serial type is incompatible with test")
t.Skip("Server serial type is incompatible with test")
}
sql := `create temporary table ledger( sql := `create temporary table ledger(
id serial primary key, id serial primary key,
@ -189,9 +187,7 @@ func TestConnSendBatchWithPreparedStatement(t *testing.T) {
conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE")) conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
defer closeConn(t, conn) defer closeConn(t, conn)
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Server issues incorrect ParameterDescription (https://github.com/cockroachdb/cockroach/issues/60907)")
t.Skip("Server issues incorrect ParameterDescription (https://github.com/cockroachdb/cockroach/issues/60907)")
}
_, err := conn.Prepare(context.Background(), "ps1", "select n from generate_series(0,$1::int) n") _, err := conn.Prepare(context.Background(), "ps1", "select n from generate_series(0,$1::int) n")
if err != nil { if err != nil {
@ -248,9 +244,7 @@ func TestConnSendBatchWithPreparedStatementAndStatementCacheDisabled(t *testing.
conn := mustConnect(t, config) conn := mustConnect(t, config)
defer closeConn(t, conn) defer closeConn(t, conn)
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Server issues incorrect ParameterDescription (https://github.com/cockroachdb/cockroach/issues/60907)")
t.Skip("Server issues incorrect ParameterDescription (https://github.com/cockroachdb/cockroach/issues/60907)")
}
_, err = conn.Prepare(context.Background(), "ps1", "select n from generate_series(0,$1::int) n") _, err = conn.Prepare(context.Background(), "ps1", "select n from generate_series(0,$1::int) n")
if err != nil { if err != nil {
@ -605,9 +599,7 @@ func TestConnBeginBatchDeferredError(t *testing.T) {
conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE")) conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
defer closeConn(t, conn) defer closeConn(t, conn)
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Server does not support deferred constraint (https://github.com/cockroachdb/cockroach/issues/31632)")
t.Skip("Server does not support deferred constraint (https://github.com/cockroachdb/cockroach/issues/31632)")
}
mustExec(t, conn, `create temporary table t ( mustExec(t, conn, `create temporary table t (
id text primary key, id text primary key,

29
conn_test.go
View File

@ -535,9 +535,7 @@ func TestListenNotifyWhileBusyIsSafe(t *testing.T) {
listenerDone <- true listenerDone <- true
}() }()
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Server does not support LISTEN / NOTIFY (https://github.com/cockroachdb/cockroach/issues/41522)")
t.Skip("Server does not support LISTEN / NOTIFY (https://github.com/cockroachdb/cockroach/issues/41522)")
}
mustExec(t, conn, "listen busysafe") mustExec(t, conn, "listen busysafe")
@ -582,9 +580,7 @@ func TestListenNotifyWhileBusyIsSafe(t *testing.T) {
notifierDone <- true notifierDone <- true
}() }()
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Server does not support LISTEN / NOTIFY (https://github.com/cockroachdb/cockroach/issues/41522)")
t.Skip("Server does not support LISTEN / NOTIFY (https://github.com/cockroachdb/cockroach/issues/41522)")
}
for i := 0; i < 100000; i++ { for i := 0; i < 100000; i++ {
mustExec(t, conn, "notify busysafe, 'hello'") mustExec(t, conn, "notify busysafe, 'hello'")
@ -602,9 +598,7 @@ func TestListenNotifySelfNotification(t *testing.T) {
conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE")) conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
defer closeConn(t, conn) defer closeConn(t, conn)
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Server does not support LISTEN / NOTIFY (https://github.com/cockroachdb/cockroach/issues/41522)")
t.Skip("Server does not support LISTEN / NOTIFY (https://github.com/cockroachdb/cockroach/issues/41522)")
}
mustExec(t, conn, "listen self") mustExec(t, conn, "listen self")
@ -639,9 +633,7 @@ func TestFatalRxError(t *testing.T) {
conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE")) conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
defer closeConn(t, conn) defer closeConn(t, conn)
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Server does not support pg_terminate_backend() (https://github.com/cockroachdb/cockroach/issues/35897)")
t.Skip("Server does not support pg_terminate_backend() (https://github.com/cockroachdb/cockroach/issues/35897)")
}
var wg sync.WaitGroup var wg sync.WaitGroup
wg.Add(1) wg.Add(1)
@ -679,9 +671,7 @@ func TestFatalTxError(t *testing.T) {
conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE")) conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
defer closeConn(t, conn) defer closeConn(t, conn)
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Server does not support pg_terminate_backend() (https://github.com/cockroachdb/cockroach/issues/35897)")
t.Skip("Server does not support pg_terminate_backend() (https://github.com/cockroachdb/cockroach/issues/35897)")
}
otherConn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE")) otherConn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
defer otherConn.Close(context.Background()) defer otherConn.Close(context.Background())
@ -846,10 +836,7 @@ func TestConnInitConnInfo(t *testing.T) {
func TestUnregisteredTypeUsableAsStringArgumentAndBaseResult(t *testing.T) { func TestUnregisteredTypeUsableAsStringArgumentAndBaseResult(t *testing.T) {
testWithAndWithoutPreferSimpleProtocol(t, func(t *testing.T, conn *pgx.Conn) { testWithAndWithoutPreferSimpleProtocol(t, func(t *testing.T, conn *pgx.Conn) {
skipCockroachDB(t, conn, "Server does support domain types (https://github.com/cockroachdb/cockroach/issues/27796)")
if conn.PgConn().ParameterStatus("crdb_version") != "" {
t.Skip("Server does support domain types (https://github.com/cockroachdb/cockroach/issues/27796)")
}
var n uint64 var n uint64
err := conn.QueryRow(context.Background(), "select $1::uint64", "42").Scan(&n) err := conn.QueryRow(context.Background(), "select $1::uint64", "42").Scan(&n)
@ -865,9 +852,7 @@ func TestUnregisteredTypeUsableAsStringArgumentAndBaseResult(t *testing.T) {
func TestDomainType(t *testing.T) { func TestDomainType(t *testing.T) {
testWithAndWithoutPreferSimpleProtocol(t, func(t *testing.T, conn *pgx.Conn) { testWithAndWithoutPreferSimpleProtocol(t, func(t *testing.T, conn *pgx.Conn) {
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Server does support domain types (https://github.com/cockroachdb/cockroach/issues/27796)")
t.Skip("Server does support domain types (https://github.com/cockroachdb/cockroach/issues/27796)")
}
var n uint64 var n uint64

4
copy_from_test.go
View File

@ -134,9 +134,7 @@ func TestConnCopyFromLarge(t *testing.T) {
conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE")) conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
defer closeConn(t, conn) defer closeConn(t, conn)
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Skipping due to known server issue: (https://github.com/cockroachdb/cockroach/issues/52722)")
t.Skip("Skipping due to known server issue: (https://github.com/cockroachdb/cockroach/issues/52722)")
}
mustExec(t, conn, `create temporary table foo( mustExec(t, conn, `create temporary table foo(
a int2, a int2,

9
helper_test.go
View File

@ -2,10 +2,11 @@ package pgx_test
import ( import (
"context" "context"
"github.com/stretchr/testify/assert"
"os" "os"
"testing" "testing"
"github.com/stretchr/testify/assert"
"github.com/jackc/pgconn" "github.com/jackc/pgconn"
"github.com/jackc/pgx/v4" "github.com/jackc/pgx/v4"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
@ -164,3 +165,9 @@ func assertConfigsEqual(t *testing.T, expected, actual *pgx.ConnConfig, testName
} }
} }
} }
func skipCockroachDB(t testing.TB, conn *pgx.Conn, msg string) {
if conn.PgConn().ParameterStatus("crdb_version") != "" {
t.Skip(msg)
}
}

12
large_objects_test.go
View File

@ -22,9 +22,7 @@ func TestLargeObjects(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Server does support large objects")
t.Skip("Server does support large objects")
}
tx, err := conn.Begin(ctx) tx, err := conn.Begin(ctx)
if err != nil { if err != nil {
@ -52,9 +50,7 @@ func TestLargeObjectsPreferSimpleProtocol(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Server does support large objects")
t.Skip("Server does support large objects")
}
tx, err := conn.Begin(ctx) tx, err := conn.Begin(ctx)
if err != nil { if err != nil {
@ -173,9 +169,7 @@ func TestLargeObjectsMultipleTransactions(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Server does support large objects")
t.Skip("Server does support large objects")
}
tx, err := conn.Begin(ctx) tx, err := conn.Begin(ctx)
if err != nil { if err != nil {

20
query_test.go
View File

@ -542,9 +542,7 @@ func TestConnQueryDeferredError(t *testing.T) {
conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE")) conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
defer closeConn(t, conn) defer closeConn(t, conn)
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Server does not support deferred constraint (https://github.com/cockroachdb/cockroach/issues/31632)")
t.Skip("Server does not support deferred constraint (https://github.com/cockroachdb/cockroach/issues/31632)")
}
mustExec(t, conn, `create temporary table t ( mustExec(t, conn, `create temporary table t (
id text primary key, id text primary key,
@ -586,9 +584,7 @@ func TestConnQueryErrorWhileReturningRows(t *testing.T) {
conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE")) conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
defer closeConn(t, conn) defer closeConn(t, conn)
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Server uses numeric instead of int")
t.Skip("Server uses numeric instead of int")
}
for i := 0; i < 100; i++ { for i := 0; i < 100; i++ {
func() { func() {
@ -1365,9 +1361,7 @@ func TestQueryContextErrorWhileReceivingRows(t *testing.T) {
conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE")) conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
defer closeConn(t, conn) defer closeConn(t, conn)
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Server uses numeric instead of int")
t.Skip("Server uses numeric instead of int")
}
ctx, cancelFunc := context.WithCancel(context.Background()) ctx, cancelFunc := context.WithCancel(context.Background())
defer cancelFunc() defer cancelFunc()
@ -1889,9 +1883,7 @@ func TestConnSimpleProtocolRefusesNonUTF8ClientEncoding(t *testing.T) {
conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE")) conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
defer closeConn(t, conn) defer closeConn(t, conn)
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Server does not support changing client_encoding (https://www.cockroachlabs.com/docs/stable/set-vars.html)")
t.Skip("Server does not support changing client_encoding (https://www.cockroachlabs.com/docs/stable/set-vars.html)")
}
mustExec(t, conn, "set client_encoding to 'SQL_ASCII'") mustExec(t, conn, "set client_encoding to 'SQL_ASCII'")
@ -1915,9 +1907,7 @@ func TestConnSimpleProtocolRefusesNonStandardConformingStrings(t *testing.T) {
conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE")) conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
defer closeConn(t, conn) defer closeConn(t, conn)
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Server does not support standard_conforming_strings = off (https://github.com/cockroachdb/cockroach/issues/36215)")
t.Skip("Server does not support standard_conforming_strings = off (https://github.com/cockroachdb/cockroach/issues/36215)")
}
mustExec(t, conn, "set standard_conforming_strings to off") mustExec(t, conn, "set standard_conforming_strings to off")

8
tx_test.go
View File

@ -106,9 +106,7 @@ func TestTxCommitWhenDeferredConstraintFailure(t *testing.T) {
conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE")) conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
defer closeConn(t, conn) defer closeConn(t, conn)
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Server does not support deferred constraint (https://github.com/cockroachdb/cockroach/issues/31632)")
t.Skip("Server does not support deferred constraint (https://github.com/cockroachdb/cockroach/issues/31632)")
}
createSql := ` createSql := `
create temporary table foo( create temporary table foo(
@ -275,9 +273,7 @@ func TestBeginIsoLevels(t *testing.T) {
conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE")) conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
defer closeConn(t, conn) defer closeConn(t, conn)
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Server always uses SERIALIZABLE isolation (https://www.cockroachlabs.com/docs/stable/demo-serializable.html)")
t.Skip("Server always uses SERIALIZABLE isolation (https://www.cockroachlabs.com/docs/stable/demo-serializable.html)")
}
isoLevels := []pgx.TxIsoLevel{pgx.Serializable, pgx.RepeatableRead, pgx.ReadCommitted, pgx.ReadUncommitted} isoLevels := []pgx.TxIsoLevel{pgx.Serializable, pgx.RepeatableRead, pgx.ReadCommitted, pgx.ReadUncommitted}
for _, iso := range isoLevels { for _, iso := range isoLevels {

4
values_test.go
View File

@ -742,9 +742,7 @@ func TestPointerPointer(t *testing.T) {
t.Parallel() t.Parallel()
testWithAndWithoutPreferSimpleProtocol(t, func(t *testing.T, conn *pgx.Conn) { testWithAndWithoutPreferSimpleProtocol(t, func(t *testing.T, conn *pgx.Conn) {
if conn.PgConn().ParameterStatus("crdb_version") != "" { skipCockroachDB(t, conn, "Server auto converts ints to bigint and test relies on exact types")
t.Skip("Server auto converts ints to bigint and test relies on exact types")
}
type allTypes struct { type allTypes struct {
s *string s *string