From c1f4cbb5cd5b69425e413c64397480293233352f Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Sat, 25 May 2024 07:48:47 -0500 Subject: [PATCH 1/2] Upgrade CockroachDB on CI --- ci/setup_test.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/setup_test.bash b/ci/setup_test.bash index 66ba07d4d..bf9b45068 100755 --- a/ci/setup_test.bash +++ b/ci/setup_test.bash @@ -42,8 +42,8 @@ fi if [[ "${PGVERSION-}" =~ ^cockroach ]] then - wget -qO- https://binaries.cockroachdb.com/cockroach-v23.1.3.linux-amd64.tgz | tar xvz - sudo mv cockroach-v23.1.3.linux-amd64/cockroach /usr/local/bin/ + wget -qO- https://binaries.cockroachdb.com/cockroach-v23.2.5.linux-amd64.tgz | tar xvz + sudo mv cockroach-v23.2.5.linux-amd64/cockroach /usr/local/bin/ cockroach start-single-node --insecure --background --listen-addr=localhost cockroach sql --insecure -e 'create database pgx_test' fi From 29751194ef05a7616ed47e244910c5daeca6487a Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Sat, 25 May 2024 07:49:00 -0500 Subject: [PATCH 2/2] Test composites on CockroachDB --- pgtype/composite_test.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pgtype/composite_test.go b/pgtype/composite_test.go index a049b448e..0d417a6f3 100644 --- a/pgtype/composite_test.go +++ b/pgtype/composite_test.go @@ -11,8 +11,6 @@ import ( ) func TestCompositeCodecTranscode(t *testing.T) { - skipCockroachDB(t, "Server does not support composite types (see https://github.com/cockroachdb/cockroach/issues/27792)") - defaultConnTestRunner.RunTest(context.Background(), t, func(ctx context.Context, t testing.TB, conn *pgx.Conn) { _, err := conn.Exec(ctx, `drop type if exists ct_test; @@ -91,8 +89,6 @@ func (p *point3d) ScanIndex(i int) any { } func TestCompositeCodecTranscodeStruct(t *testing.T) { - skipCockroachDB(t, "Server does not support composite types (see https://github.com/cockroachdb/cockroach/issues/27792)") - defaultConnTestRunner.RunTest(context.Background(), t, func(ctx context.Context, t testing.TB, conn *pgx.Conn) { _, err := conn.Exec(ctx, `drop type if exists point3d; @@ -128,8 +124,6 @@ create type point3d as ( } func TestCompositeCodecTranscodeStructWrapper(t *testing.T) { - skipCockroachDB(t, "Server does not support composite types (see https://github.com/cockroachdb/cockroach/issues/27792)") - defaultConnTestRunner.RunTest(context.Background(), t, func(ctx context.Context, t testing.TB, conn *pgx.Conn) { _, err := conn.Exec(ctx, `drop type if exists point3d; @@ -169,8 +163,6 @@ create type point3d as ( } func TestCompositeCodecDecodeValue(t *testing.T) { - skipCockroachDB(t, "Server does not support composite types (see https://github.com/cockroachdb/cockroach/issues/27792)") - defaultConnTestRunner.RunTest(context.Background(), t, func(ctx context.Context, t testing.TB, conn *pgx.Conn) { _, err := conn.Exec(ctx, `drop type if exists point3d; @@ -214,8 +206,6 @@ create type point3d as ( // // https://github.com/jackc/pgx/issues/1576 func TestCompositeCodecTranscodeStructWrapperForTable(t *testing.T) { - skipCockroachDB(t, "Server does not support composite types (see https://github.com/cockroachdb/cockroach/issues/27792)") - defaultConnTestRunner.RunTest(context.Background(), t, func(ctx context.Context, t testing.TB, conn *pgx.Conn) { _, err := conn.Exec(ctx, `drop table if exists point3d;