@catladder/cli 3.34.2 → 3.36.0

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "3.34.2",
+  "version": "3.36.0",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",

package/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.ts

@@ -7,7 +7,7 @@ import type { CloudSqlBackgroundProxy } from "../../../../../gcloud/cloudSql/sta
 import { startCloudSqlProxyInBackground } from "../../../../../gcloud/cloudSql/startProxy";
 import { envAndComponents } from "../utils/autocompletions";
 
-import { ConnectionStringParser } from "connection-string-parser";
+import { parseConnectionString } from "../../../../../gcloud/cloudSql/parseConnectionString";
 import { spawnCopyDb } from "../../../../../gcloud/cloudSql/copyDb";
 
 export default async (vorpal: Vorpal) =>
@@ -60,12 +60,7 @@ export default async (vorpal: Vorpal) =>
       };
 
       if (sourceEnv === "local") {
-        const parser = new ConnectionStringParser({
-          scheme: "postgres",
-          hosts: [],
-        });
-
-        const parsersResult = parser.parse(
+        const parsersResult = parseConnectionString(
           sourceEnvVars.DATABASE_URL.toString(),
         );
         sourcePort = parsersResult.hosts?.[0]?.port;
@@ -107,12 +102,7 @@ export default async (vorpal: Vorpal) =>
       );
 
       if (targetEnv === "local") {
-        const parser = new ConnectionStringParser({
-          scheme: "postgres",
-          hosts: [],
-        });
-
-        const parsersResult = parser.parse(
+        const parsersResult = parseConnectionString(
           targetEnvVars.DATABASE_URL.toString(),
         );
 

package/src/gcloud/cloudSql/parseConnectionString.ts

@@ -0,0 +1,28 @@
+import {
+  ConnectionStringParser,
+  type IConnectionStringParameters,
+} from "connection-string-parser";
+
+/**
+ * Parses a PostgreSQL connection string.
+ * Accepts both postgres:// and postgresql:// schemes and normalizes to postgresql://
+ *
+ * @param connectionString - The connection string to parse (e.g., "postgresql://user:pass@localhost:5432/dbname")
+ * @returns Parsed connection string parameters
+ */
+export function parseConnectionString(
+  connectionString: string,
+): IConnectionStringParameters {
+  const parser = new ConnectionStringParser({
+    scheme: "postgresql",
+    hosts: [],
+  });
+
+  // Normalize postgres:// to postgresql:// (the official IANA scheme)
+  const normalizedConnectionString = connectionString.replace(
+    /^postgres:\/\//,
+    "postgresql://",
+  );
+
+  return parser.parse(normalizedConnectionString);
+}