Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions internal-packages/dashboard-agent-db/migrate-status.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ import postgres from "postgres";
const MIGRATIONS_SCHEMA = "drizzle";
const MIGRATIONS_TABLE = "__dashboard_agent_migrations";

// Match migrate.mjs: a direct (non-pooler) connection, same precedence.
const connectionString =
// Match migrate.mjs: same precedence, and expand `${VAR}` refs (see migrate.mjs).
const connectionString = (
process.env.DASHBOARD_AGENT_DIRECT_URL ??
process.env.DASHBOARD_AGENT_DATABASE_URL ??
process.env.DIRECT_URL ??
process.env.DATABASE_URL;
process.env.DATABASE_URL
)?.replace(/\$\{(\w+)\}/g, (_, k) => process.env[k] ?? "");

if (!connectionString) {
console.error(
Expand Down
7 changes: 5 additions & 2 deletions internal-packages/dashboard-agent-db/migrate.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@ import postgres from "postgres";
// can't run the migrator. Prefer the agent's direct url, then its pooled url,
// then the main DIRECT_URL/DATABASE_URL (OSS single-database fallback; tables
// still land in the `trigger_dashboard_agent` schema).
const connectionString =
// `.replace` expands `${VAR}` refs (e.g. the repo .env's DIRECT_URL=${DATABASE_URL});
// node's --env-file loads them literally, unlike Prisma's dotenv-expand.
const connectionString = (
process.env.DASHBOARD_AGENT_DIRECT_URL ??
process.env.DASHBOARD_AGENT_DATABASE_URL ??
process.env.DIRECT_URL ??
process.env.DATABASE_URL;
process.env.DATABASE_URL
)?.replace(/\$\{(\w+)\}/g, (_, k) => process.env[k] ?? "");

if (!connectionString) {
console.error(
Expand Down
4 changes: 2 additions & 2 deletions internal-packages/dashboard-agent-db/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"typecheck": "tsc --noEmit",
"db:generate": "drizzle-kit generate",
"db:migrate": "drizzle-kit migrate",
"db:migrate:deploy": "node migrate.mjs",
"db:migrate:status": "node migrate-status.mjs",
"db:migrate:deploy": "node --env-file-if-exists=../../.env migrate.mjs",
"db:migrate:status": "node --env-file-if-exists=../../.env migrate-status.mjs",
Comment thread
carderne marked this conversation as resolved.
Comment thread
carderne marked this conversation as resolved.
"db:studio": "drizzle-kit studio"
}
}