Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

refactor(pg-meta): consolidate test scripts and support parallel test runs across worktrees (#45340)

Charisf051c6a1c1c7
diff --git a/packages/pg-meta/package.json b/packages/pg-meta/package.json
index 840de68fc15..5adb1dd464c 100644
--- a/packages/pg-meta/package.json
+++ b/packages/pg-meta/package.json
@@ -8,11 +8,8 @@
"scripts": {
"preinstall": "npx only-allow pnpm",
"clean": "rimraf node_modules .turbo tsconfig.tsbuildinfo",
- "test": "run-s db:clean db:run test:run db:clean",
- "db:clean": "cd test/db && docker compose down",
- "db:run": "cd test/db && docker compose up --detach --wait",
- "test:run": "vitest run --coverage",
- "test:update": "vitest run --update",
+ "test": "test/run-tests.sh vitest run --coverage",
+ "test:update": "test/run-tests.sh vitest run --update",
"lint": "tsc --noEmit",
"typecheck": "tsc --noEmit"
},
diff --git a/packages/pg-meta/test/db/docker-compose.yml b/packages/pg-meta/test/db/docker-compose.yml
index d64c92b4d64..f8ca41d81ad 100755
--- a/packages/pg-meta/test/db/docker-compose.yml
+++ b/packages/pg-meta/test/db/docker-compose.yml
@@ -2,7 +2,7 @@ services:
db:
build: .
ports:
- - 5432:5432
+ - ${PG_TEST_PORT:-5432}:5432
volumes:
- .:/docker-entrypoint-initdb.d
environment:
diff --git a/packages/pg-meta/test/run-tests.sh b/packages/pg-meta/test/run-tests.sh
new file mode 100755
index 00000000000..863d4a22dcb
--- /dev/null
+++ b/packages/pg-meta/test/run-tests.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+PACKAGE_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
+DB_DIR="$SCRIPT_DIR/db"
+
+# Unique project name per worktree so containers don't collide
+PROJECT_HASH=$(echo "$PACKAGE_DIR" | shasum | cut -c1-8)
+COMPOSE_PROJECT_NAME="pg-meta-${PROJECT_HASH}"
+export COMPOSE_PROJECT_NAME
+
+# Find an available port in the range 5432-5531
+PG_TEST_PORT=5432
+MAX_PORT=5531
+while nc -z localhost "$PG_TEST_PORT" 2>/dev/null; do
+ if [ "$PG_TEST_PORT" -ge "$MAX_PORT" ]; then
+ echo "error: no available port found in range 5432-${MAX_PORT}" >&2
+ exit 1
+ fi
+ PG_TEST_PORT=$((PG_TEST_PORT + 1))
+done
+export PG_TEST_PORT
+
+DATABASE_URL="postgresql://postgres:postgres@localhost:${PG_TEST_PORT}"
+export DATABASE_URL
+
+cleanup() {
+ cd "$DB_DIR"
+ docker compose down 2>/dev/null || true
+}
+trap cleanup EXIT
+
+cd "$DB_DIR"
+docker compose down 2>/dev/null || true
+docker compose up --detach --wait
+
+cd "$PACKAGE_DIR"
+"$@"
+rc=$?
+exit $rc