Merge pull request #1594 from bradengroom/pgbouncer

Run postgres datastore tests with pgbouncer

.github/workflows/build-test.yaml

@@ -94,7 +94,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        datastore: ["crdb", "mysql", "postgres", "spanner"]
+        datastore: ["crdb", "mysql", "postgres", "spanner", "pgbouncer"]
     steps:
       - uses: "actions/checkout@v3"
       - uses: "authzed/actions/setup-go@main"

internal/datastore/postgres/pgbouncer_test.go

@@ -0,0 +1,31 @@
+//go:build ci && docker && pgbouncer
+// +build ci,docker,pgbouncer
+
+package postgres
+
+import (
+	"testing"
+
+	pgversion "github.com/authzed/spicedb/internal/datastore/postgres/version"
+
+	"github.com/samber/lo"
+)
+
+var pgbouncerConfigs = lo.Map(
+	[]string{pgversion.MinimumSupportedPostgresVersion, "14", "15", "16"},
+	func(postgresVersion string, _ int) postgresConfig {
+		return postgresConfig{"head", "", postgresVersion, true}
+	},
+)
+
+func TestPostgresWithPgBouncerDatastore(t *testing.T) {
+	t.Parallel()
+
+	testPostgresDatastore(t, pgbouncerConfigs)
+}
+
+func TestPostgresDatastoreWithPgBouncerWithoutCommitTimestamps(t *testing.T) {
+	t.Parallel()
+
+	testPostgresDatastoreWithoutCommitTimestamps(t, pgbouncerConfigs)
+}