Upgrade tested version of CockroachDB to v25.4.4

Author: jackc

.devcontainer/docker-compose.yml

@@ -93,7 +93,7 @@ services:
       POSTGRES_HOSTNAME: localhost
 
   cockroachdb:
-    image: cockroachdb/cockroach:v24.3.3
+    image: cockroachdb/cockroach:v25.4.4
     restart: unless-stopped
     network_mode: service:app
     command: start-single-node --insecure --listen-addr=127.0.0.1:26257 --store=type=mem,size=1024MiB

batch_test.go

@@ -1033,6 +1033,8 @@ func TestSendBatchStatementTimeout(t *testing.T) {
 	defer cancel()
 
 	pgxtest.RunWithQueryExecModes(ctx, t, defaultConnTestRunner, nil, func(ctx context.Context, t testing.TB, conn *pgx.Conn) {
+		pgxtest.SkipCockroachDB(t, conn, "CockroachDB does not recover connection after batch statement timeout")
+
 		batch := &pgx.Batch{}
 		batch.Queue("SET statement_timeout='1ms'")
 		batch.Queue("SELECT pg_sleep(10)")

ci/setup_test.bash

@@ -42,8 +42,8 @@ fi
 
 if [[ "${PGVERSION-}" =~ ^cockroach ]]
 then
-  wget -qO- https://binaries.cockroachdb.com/cockroach-v24.3.3.linux-amd64.tgz | tar xvz
-  sudo mv cockroach-v24.3.3.linux-amd64/cockroach /usr/local/bin/
+  wget -qO- https://binaries.cockroachdb.com/cockroach-v25.4.4.linux-amd64.tgz | tar xvz
+  sudo mv cockroach-v25.4.4.linux-amd64/cockroach /usr/local/bin/
   cockroach start-single-node --insecure --background --listen-addr=localhost
   cockroach sql --insecure -e 'create database pgx_test'
 fi

query_test.go

@@ -195,6 +195,7 @@ func TestConnQueryValuesWhenUnableToDecode(t *testing.T) {
 
 func TestConnQueryValuesWithUnregisteredOID(t *testing.T) {
 	t.Parallel()
+	skipCockroachDB(t, "CockroachDB auto commits DDL by default")
 
 	ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second)
 	defer cancel()
@@ -222,6 +223,7 @@ func TestConnQueryValuesWithUnregisteredOID(t *testing.T) {
 
 func TestConnQueryArgsAndScanWithUnregisteredOID(t *testing.T) {
 	t.Parallel()
+	skipCockroachDB(t, "CockroachDB auto commits DDL by default")
 
 	ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second)
 	defer cancel()

stdlib/sql_test.go

@@ -745,6 +745,8 @@ func TestConnBeginTxReadOnly(t *testing.T) {
 
 func TestBeginTxContextCancel(t *testing.T) {
 	testWithAllQueryExecModes(t, func(t *testing.T, db *sql.DB) {
+		skipCockroachDB(t, db, "CockroachDB auto commits DDL by default")
+
 		_, err := db.Exec("drop table if exists t")
 		require.NoError(t, err)
 
@@ -1408,6 +1410,8 @@ func TestOpenTransactionsDiscarded(t *testing.T) {
 	db := openDB(t)
 	defer closeDB(t, db)
 
+	skipCockroachDB(t, db, "CockroachDB auto commits DDL by default")
+
 	db.SetMaxOpenConns(1)
 	ctx := context.Background()
 

tracelog/tracelog_test.go

@@ -339,6 +339,8 @@ func TestLogBatchStatementsOnExec(t *testing.T) {
 	}
 
 	pgxtest.RunWithQueryExecModes(ctx, t, ctr, nil, func(ctx context.Context, t testing.TB, conn *pgx.Conn) {
+		pgxtest.SkipCockroachDB(t, conn, "CockroachDB auto commits DDL by default")
+
 		logger.Clear() // Clear any logs written when establishing connection
 
 		batch := &pgx.Batch{}

tx_test.go

@@ -356,6 +356,7 @@ func TestBeginFuncRollbackOnError(t *testing.T) {
 
 func TestBeginReadOnly(t *testing.T) {
 	t.Parallel()
+	skipCockroachDB(t, "CockroachDB auto commits DDL by default")
 
 	conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
 	defer closeConn(t, conn)