Skip to content

Migrate connection string to new connections model #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kristof-siket merged 3 commits into from
Mar 2, 2026
Merged

Migrate connection string to new connections model #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa73f59
Migrate connection string from deprecated apiKeys to new connections …
kristof-siket Mar 2, 2026
0ba6ca2
Use .find() to select a connection with a usable connectionString
kristof-siket Mar 2, 2026
a62d08a
refactor: remove legacy connection string fallback
kristof-siket Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 9 additions & 21 deletions create-db/src/core/database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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`;

Expand Down
20 changes: 20 additions & 0 deletions create-db/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[];
}

Expand Down