Merge branch 'main' into feat/passkey

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;
 };

packages/prisma/package.json

@@ -19,12 +19,12 @@
   },
   "dependencies": {
     "@prisma/client": "5.4.2",
-    "dotenv": "^16.3.1",
-    "dotenv-cli": "^7.3.0",
     "prisma": "5.4.2",
     "ts-pattern": "^5.0.6"
   },
   "devDependencies": {
+    "dotenv": "^16.3.1",
+    "dotenv-cli": "^7.3.0",
     "ts-node": "^10.9.1",
     "typescript": "5.2.2"
   }

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);
+        }
       }
     }
   }