supabase · Coly010 · Jun 11, 2026 · Jun 9, 2026 · Jun 9, 2026 · Jun 9, 2026
@@ -365,5 +365,19 @@ describe("test db", () => {
     expect(result.stderr).toContain("connect");
   });
 
-  testParity(["test", "db", "--local"]);
+  // No testParity for `test db --local`: with no local Postgres listening in the
+  // harness, the only reachable path is the connection-failure path, and its
+  // stderr diverges by driver in ways that aren't cosmetic and can't be
+  // normalized away. Both now emit Go's leading diagnostic to stderr:
+  //   Connecting to local database...
+  // but the connect-error body and trailing hint still differ by driver. Go (pgx):
+  //   failed to connect to postgres: failed to connect to `host=… user=… database=…`: dial error (dial tcp …: connect: connection refused)
+  //   Make sure your local IP is allowed in Network Restrictions and Network Bans.
+  //   http://…/project/_/database/settings
+  // The TS port (@effect/sql-pg) prints the effect SqlError and the --debug hint:
+  //   failed to connect to postgres: effect/sql/SqlError: PgClient: Failed to connect
+  //   Try rerunning the command with --debug to troubleshoot the error.
+  // The meaningful contract (non-zero exit + a connect error on stderr) is
+  // covered by the behaviour test above. A real connect-path parity test would
+  // need a live local database in the harness.
 });
diff --git a/apps/cli/package.json b/apps/cli/package.json
@@ -43,6 +43,7 @@
     "@clack/prompts": "^1.5.1",
     "@effect/atom-react": "catalog:",
     "@effect/platform-bun": "catalog:",
+    "@effect/sql-pg": "catalog:",
     "@effect/vitest": "catalog:",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "@napi-rs/keyring": "^1.3.0",
@@ -70,6 +71,7 @@
     "react-devtools-core": "^7.0.1",
     "semantic-release": "^25.0.3",
     "smol-toml": "^1.6.1",
+    "tldts": "catalog:",
     "vitest": "catalog:",
     "yaml": "^2.9.0"
   },

@@ -32,6 +32,7 @@ function mockCliConfig(opts: {
     profile: opts.profile ?? "supabase",
     apiUrl: opts.apiUrl ?? "https://api.supabase.com",
     projectHost: opts.projectHost ?? "supabase.co",
+    poolerHost: "supabase.com",
     accessToken:
       opts.accessToken === undefined ? Option.none() : Option.some(Redacted.make(opts.accessToken)),
     projectId: Option.none(),

@@ -125,50 +125,3 @@ export function marshalDotEnv(env: Readonly<Record<string, string>>): string {
   lines.sort();
   return lines.join("\n");
 }
-
-// godotenv.Parse-compatible enough for `.env.example`: `KEY=VALUE` / `KEY="VALUE"`
-// lines, `#` comments, blank lines. A line with an empty / invalid variable name
-// throws (Go's `godotenv.Parse` surfaces `unexpected character ... in variable name`).
-const EXPORT_PREFIX = /^\s*export\s+/;
-
-/**
- * Minimal godotenv parser for `.env.example`. Returns the parsed key/value map.
- * Throws an `Error` whose message mirrors Go's parser for a malformed variable
- * name so the caller can surface the same failure (`"!="` → unexpected character).
- */
-export function parseDotEnv(contents: string): Record<string, string> {
-  const result: Record<string, string> = {};
-  for (const rawLine of contents.split("\n")) {
-    const line = rawLine.replace(EXPORT_PREFIX, "").trim();
-    if (line.length === 0 || line.startsWith("#")) {
-      continue;
-    }
-    const eq = line.indexOf("=");
-    if (eq <= 0) {
-      const offending = line.slice(0, eq < 0 ? line.length : eq + 1);
-      throw new Error(
-        `unexpected character "${line[0] ?? ""}" in variable name near "${offending}"`,
-      );
-    }
-    const key = line.slice(0, eq).trim();
-    if (!/^[A-Za-z_][A-Za-z0-9_.]*$/.test(key)) {
-      throw new Error(`unexpected character "${key[0] ?? ""}" in variable name near "${line}"`);
-    }
-    let value = line.slice(eq + 1).trim();
-    if (value.startsWith('"') && value.endsWith('"') && value.length >= 2) {
-      // godotenv expands escapes inside double-quoted values: `\n` / `\r` become
-      // real newlines, and a backslash before any other char (except `$`) is
-      // dropped (`\"` -> `"`, `\\` -> `\`).
-      value = value
-        .slice(1, -1)
-        .replaceAll("\\n", "\n")
-        .replaceAll("\\r", "\r")
-        .replace(/\\([^$])/g, "$1");
-    } else if (value.startsWith("'") && value.endsWith("'") && value.length >= 2) {
-      // Single-quoted values are taken literally (no escape expansion).
-      value = value.slice(1, -1);
-    }
-    result[key] = value;
-  }
-  return result;
-}
@@ -1,7 +1,7 @@
 import type { ApiKeyResponse } from "@supabase/api/effect";
 import { describe, expect, it } from "vitest";
 
-import { buildDotEnv, marshalDotEnv, parseDotEnv } from "./bootstrap.dotenv.ts";
+import { buildDotEnv, marshalDotEnv } from "./bootstrap.dotenv.ts";
 import type { LegacyDbConfig } from "./bootstrap.pgconfig.ts";
 
 type ApiKey = typeof ApiKeyResponse.Type;
@@ -94,28 +94,3 @@ describe("marshalDotEnv", () => {
     );
   });
 });
-
-describe("parseDotEnv", () => {
-  it("parses KEY=VALUE lines, skipping comments and blanks, and strips quotes", () => {
-    expect(parseDotEnv('# comment\nFOO=bar\n\nBAZ="quoted"\nexport QUX=1')).toEqual({
-      FOO: "bar",
-      BAZ: "quoted",
-      QUX: "1",
-    });
-  });
-
-  it("expands escape sequences in double-quoted values (godotenv parity)", () => {
-    expect(parseDotEnv('A="line1\\nline2"\nB="a\\"b\\\\c"')).toEqual({
-      A: "line1\nline2",
-      B: 'a"b\\c',
-    });
-  });
-
-  it("takes single-quoted values literally (no escape expansion)", () => {
-    expect(parseDotEnv("A='line1\\nline2'")).toEqual({ A: "line1\\nline2" });
-  });
-
-  it("throws Go's 'unexpected character' error on a malformed variable name", () => {
-    expect(() => parseDotEnv("!=")).toThrow(/unexpected character "!" in variable name/);
-  });
-});
@@ -18,8 +18,9 @@ import { legacyLinkServicesCore } from "../../shared/legacy-link-services-core.t
 import { legacyProjectCreateCore } from "../../shared/legacy-project-create-core.ts";
 import { legacyTempPaths } from "../../shared/legacy-temp-paths.ts";
 import { legacyExtractServiceKeys } from "../../shared/legacy-tenant-keys.ts";
+import { parseDotEnv } from "../../shared/legacy-dotenv.ts";
 import { initProject } from "../../../shared/init/project-init.ts";
-import { buildDotEnv, marshalDotEnv, parseDotEnv } from "./bootstrap.dotenv.ts";
+import { buildDotEnv, marshalDotEnv } from "./bootstrap.dotenv.ts";
 import {
   LegacyBootstrapHealthError,
   LegacyBootstrapInvalidTemplateError,

@@ -14,10 +14,10 @@ import { LegacyLinkedProjectCache } from "../../../telemetry/legacy-linked-proje
 import { LegacyTelemetryState } from "../../../telemetry/legacy-telemetry-state.service.ts";
 import type { LegacyGenTypesFlags } from "./types.command.ts";
 import { LegacyGenTypesNetworkError, LegacyGenTypesUnexpectedStatusError } from "./types.errors.ts";
+import { legacyGetHostname } from "../../../shared/legacy-hostname.ts";
 import {
   buildPostgresUrl,
   defaultSchemas,
-  getServicesHostname,
   localDbContainerId,
   localDbPassword,
   localNetworkId,
@@ -400,7 +400,7 @@ export const legacyGenTypes = Effect.fn("legacy.gen.types")(function* (flags: Le
         }),
         host: "db",
         port: 5432,
-        probeHost: getServicesHostname(),
+        probeHost: legacyGetHostname(),
         probePort: loaded.config.db.port,
         networkMode: localNetworkId(projectId),
         includedSchemas,

@@ -117,10 +117,6 @@ export function parseQueryTimeoutSeconds(
   });
 }
 
-export function getServicesHostname() {
-  return process.env["SUPABASE_SERVICES_HOSTNAME"] || "127.0.0.1";
-}
-
 /**
  * The default generated docker network name for a local project (Go's `utils.NetId`
  * fallback, `GetId("network")`). The `--network-id` override is applied at the docker

@@ -1,10 +1,10 @@
 import { createServer, type Server, type Socket } from "node:net";
 import { describe, expect, it } from "@effect/vitest";
 import { Effect, Exit } from "effect";
+import { legacyGetHostname } from "../../../shared/legacy-hostname.ts";
 import {
   buildPostgresUrl,
   defaultSchemas,
-  getServicesHostname,
   legacyRootCaBundle,
   localDbContainerId,
   localDbPassword,
@@ -209,10 +209,12 @@ describe("schema and id helpers", () => {
   });
 
   it("reads the services hostname and db password from the environment", () => {
-    expect(withEnv("SUPABASE_SERVICES_HOSTNAME", undefined, () => getServicesHostname())).toBe(
-      "127.0.0.1",
-    );
-    expect(withEnv("SUPABASE_SERVICES_HOSTNAME", "db.internal", () => getServicesHostname())).toBe(
+    expect(
+      withEnv("DOCKER_HOST", undefined, () =>
+        withEnv("SUPABASE_SERVICES_HOSTNAME", undefined, () => legacyGetHostname()),
+      ),
+    ).toBe("127.0.0.1");
+    expect(withEnv("SUPABASE_SERVICES_HOSTNAME", "db.internal", () => legacyGetHostname())).toBe(
       "db.internal",
     );
     expect(withEnv("SUPABASE_DB_PASSWORD", undefined, () => localDbPassword())).toBe("postgres");

@@ -50,6 +50,7 @@ function setup(
           profile: "supabase",
           apiUrl: "https://api.supabase.com",
           projectHost: "supabase.co",
+          poolerHost: "supabase.com",
           accessToken: Option.none(),
           projectId: Option.none(),
           workdir: process.cwd(),