Merge pull request #80 from prisma/ptl-1046-migrate-create-db-to-use-new-connection-model-fields

Migrate connection string to new connections model

Author: kristof-siket

create-db/src/core/database.ts

@@ -1,5 +1,5 @@
 import { randomUUID } from "crypto";
-import type { CreateDatabaseResult, ApiResponse } from "../types.js";
+import type { ApiResponse, CreateDatabaseResult } from "../types.js";
 import { sendAnalytics } from "../utils/analytics.js";
 
 export function getCommandName(): string {
@@ -116,27 +116,15 @@ export async function createDatabaseCore(
   const database = result.data?.database ?? result.databases?.[0];
   const projectId = result.data?.id ?? result.id ?? "";
 
-  const apiKeys = database?.apiKeys;
-  const directConnDetails = result.data
-    ? apiKeys?.[0]?.directConnection
-    : result.databases?.[0]?.apiKeys?.[0]?.ppgDirectConnection;
-
-  const directUser = directConnDetails?.user
-    ? encodeURIComponent(String(directConnDetails.user))
-    : "";
-  const directPass = directConnDetails?.pass
-    ? encodeURIComponent(String(directConnDetails.pass))
-    : "";
-  const directHost = directConnDetails?.host;
-  const directPort = directConnDetails?.port
-    ? `:${directConnDetails.port}`
-    : "";
-  const directDbName = directConnDetails?.database || "postgres";
-
+  const connection = database?.connections?.find(
+    (c) =>
+      Boolean(c.endpoints?.direct?.connectionString) ||
+      Boolean(c.endpoints?.pooled?.connectionString),
+  );
   const connectionString =
-    directConnDetails && directHost
-      ? `postgresql://${directUser}:${directPass}@${directHost}${directPort}/${directDbName}?sslmode=require`
-      : null;
+    connection?.endpoints?.direct?.connectionString
+    ?? connection?.endpoints?.pooled?.connectionString
+    ?? null;
 
   const claimUrl = `${claimDbWorkerUrl}/claim?projectID=${projectId}&utm_source=${userAgent || getCommandName()}&utm_medium=cli`;
 

create-db/src/types.ts

@@ -80,11 +80,31 @@ export interface ApiResponseData {
   database?: DatabaseRecord;
 }
 
+export interface ConnectionEndpoint {
+  host: string;
+  port: number;
+  connectionString?: string;
+}
+
+export interface Connection {
+  id: string;
+  type: string;
+  name: string;
+  kind: "postgres" | "accelerate";
+  endpoints: {
+    direct?: ConnectionEndpoint;
+    pooled?: ConnectionEndpoint;
+    accelerate?: ConnectionEndpoint;
+  };
+  database: { id: string; name: string };
+}
+
 export interface DatabaseRecord {
   name?: string;
   region?: {
     id?: string;
   };
+  connections?: Connection[];
   apiKeys?: ApiKey[];
 }