The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
fix: remove duplicate neon pooler (#990)
David Nguyenf6eddaa9f628
diff --git a/packages/prisma/helper.ts b/packages/prisma/helper.tsindex 3acd113fc..512f7cd55 100644--- a/packages/prisma/helper.ts+++ b/packages/prisma/helper.ts@@ -15,6 +15,10 @@ export const getDatabaseUrl = () => {process.env.NEXT_PRIVATE_DIRECT_DATABASE_URL = process.env.DATABASE_URL;}+ if (process.env.DATABASE_URL_UNPOOLED) {+ process.env.NEXT_PRIVATE_DIRECT_DATABASE_URL = process.env.DATABASE_URL_UNPOOLED;+ }+if (process.env.POSTGRES_PRISMA_URL) {process.env.NEXT_PRIVATE_DATABASE_URL = process.env.POSTGRES_PRISMA_URL;}@@ -40,18 +44,5 @@ export const getDatabaseUrl = () => {process.env.NEXT_PRIVATE_DATABASE_URL = url.toString().replace('https://', 'postgres://');}- // Support for neon.tech (Neon Database)- if (url.hostname.endsWith('neon.tech')) {- const [projectId, ...rest] = url.hostname.split('.');-- if (!projectId.endsWith('-pooler')) {- url.hostname = `${projectId}-pooler.${rest.join('.')}`;- }-- url.searchParams.set('pgbouncer', 'true');-- process.env.NEXT_PRIVATE_DATABASE_URL = url.toString().replace('https://', 'postgres://');- }-return process.env.NEXT_PRIVATE_DATABASE_URL;};diff --git a/packages/prisma/seed-database.ts b/packages/prisma/seed-database.tsindex e9db2a30c..c2bdde60e 100644--- a/packages/prisma/seed-database.ts+++ b/packages/prisma/seed-database.ts@@ -13,7 +13,13 @@ const seedDatabase = async () => {if ('seedDatabase' in mod && typeof mod.seedDatabase === 'function') {console.log(`[SEEDING]: ${file}`);- await mod.seedDatabase();++ try {+ await mod.seedDatabase();+ } catch (e) {+ console.log(`[SEEDING]: Seed failed for ${file}`);+ console.error(e);+ }}}}diff --git a/scripts/vercel.sh b/scripts/vercel.shindex 30fe99476..4be594f4e 100755--- a/scripts/vercel.sh+++ b/scripts/vercel.sh@@ -6,7 +6,6 @@ set -eo pipefail# Get the directory of this script, regardless of where it is called from.SCRIPT_DIR="$(readlink -f "$(dirname "$0")")"-function log() {echo "[VercelBuild]: $1"}@@ -69,18 +68,16 @@ function remap_database_integration() {export NEXT_PRIVATE_DIRECT_DATABASE_URL="$DATABASE_URL"fi- if [[ ! -z "$POSTGRES_URL_NON_POOLING" ]]; then- export NEXT_PRIVATE_DATABASE_URL="$POSTGRES_URL?pgbouncer=true"- export NEXT_PRIVATE_DIRECT_DATABASE_URL="$POSTGRES_URL_NON_POOLING"- fi-- if [[ "$NEXT_PRIVATE_DATABASE_URL" == *"neon.tech"* ]]; then+ if [[ ! -z "$DATABASE_URL_UNPOOLED" ]]; thenlog "Remapping for Neon integration"- PROJECT_ID="$(echo "$PGHOST" | cut -d'.' -f1)"- PGBOUNCER_HOST="$(echo "$PGHOST" | sed "s/${PROJECT_ID}/${PROJECT_ID}-pooler/")"+ export NEXT_PRIVATE_DATABASE_URL="$DATABASE_URL&pgbouncer=true"+ export NEXT_PRIVATE_DIRECT_DATABASE_URL="$DATABASE_URL_UNPOOLED"+ fi- export NEXT_PRIVATE_DATABASE_URL="postgres://${PGUSER}:${PGPASSWORD}@${PGBOUNCER_HOST}/${PGDATABASE}?pgbouncer=true"+ if [[ ! -z "$POSTGRES_URL_NON_POOLING" ]]; then+ export NEXT_PRIVATE_DATABASE_URL="$POSTGRES_URL?pgbouncer=true"+ export NEXT_PRIVATE_DIRECT_DATABASE_URL="$POSTGRES_URL_NON_POOLING"fi}diff --git a/turbo.json b/turbo.jsonindex 995ed43e5..5e2c5526c 100644--- a/turbo.json+++ b/turbo.json@@ -90,6 +90,7 @@"FONT_CAVEAT_URI","POSTGRES_URL","DATABASE_URL",+ "DATABASE_URL_UNPOOLED","POSTGRES_PRISMA_URL","POSTGRES_URL_NON_POOLING","E2E_TEST_AUTHENTICATE_USERNAME",