fix(postgres): update connection string handling for optional port (#326)

skyrpex · web-flow · commit 72406437c07b · 2025-01-07T09:03:06.000+01:00
diff --git a/postgres/pg.js b/postgres/pg.js
@@ -14,7 +14,7 @@ exports._queryWithConnectionString = async function(query, connectionString) {
 }
 
 function encodePasswordInConnectionString(connectionString) {
-  const regex = /^(postgresql:\/\/)([^:]+):([^@]+)@([^:\/]+):(\d+)\/(.+)$/;
+  const regex = /^(postgresql:\/\/)([^:]+):([^@]+)@([^:\/]+)(:\d+)?\/(.+)$/;
   const match = connectionString.match(regex);
 
   if (!match) {
@@ -25,7 +25,7 @@ function encodePasswordInConnectionString(connectionString) {
 
   const encodedPassword = encodeURIComponent(password);
 
-  return `${protocol}${username}:${encodedPassword}@${host}:${port}/${database}`;
+  return `${protocol}${username}:${encodedPassword}@${host}${port ?? ""}/${database}`;
 }
 
 // workaround for readiness probe

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ exports._queryWithConnectionString = async function(query, connectionString) {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`function encodePasswordInConnectionString(connectionString) {`
`17`		`- const regex = /^(postgresql:\/\/)([^:]+):([^@]+)@([^:\/]+):(\d+)\/(.+)$/;`
	`17`	`+ const regex = /^(postgresql:\/\/)([^:]+):([^@]+)@([^:\/]+)(:\d+)?\/(.+)$/;`
`18`	`18`	`const match = connectionString.match(regex);`
`19`	`19`
`20`	`20`	`if (!match) {`
`@@ -25,7 +25,7 @@ function encodePasswordInConnectionString(connectionString) {`
`25`	`25`
`26`	`26`	`const encodedPassword = encodeURIComponent(password);`
`27`	`27`
`28`		- return `${protocol}${username}:${encodedPassword}@${host}:${port}/${database}`;
	`28`	+ return `${protocol}${username}:${encodedPassword}@${host}${port ?? ""}/${database}`;
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// workaround for readiness probe`