Use pg-connection-string for ?sslrootcert support

Author: benjie

@app/server/__tests__/helpers.ts

@@ -1,6 +1,7 @@
 import { Request, Response } from "express";
 import { ExecutionResult, graphql, GraphQLSchema } from "graphql";
 import { Pool, PoolClient } from "pg";
+import { parse } from "pg-connection-string";
 import {
   createPostGraphileSchema,
   PostGraphileOptions,
@@ -105,9 +106,7 @@ interface ICtx {
 let ctx: ICtx | null = null;
 
 export const setup = async () => {
-  const rootPgPool = new Pool({
-    connectionString: process.env.TEST_DATABASE_URL,
-  });
+  const rootPgPool = new Pool(parse(process.env.TEST_DATABASE_URL) as any);
 
   const options = getPostGraphileOptions({ rootPgPool });
   const schema = await createPostGraphileSchema(

@app/server/package.json

@@ -39,6 +39,7 @@
     "passport": "^0.4.1",
     "passport-github2": "^0.1.11",
     "pg": "^8.0.3",
+    "pg-connection-string": "^2.2.0",
     "postgraphile": "^4.7.0",
     "redis": "^3.0.2",
     "source-map-support": "^0.5.13",

@app/server/src/middleware/installDatabasePools.ts

@@ -1,5 +1,6 @@
 import { Express } from "express";
 import { Pool } from "pg";
+import { parse } from "pg-connection-string";
 
 import { getShutdownActions } from "../app";
 
@@ -25,16 +26,12 @@ function swallowPoolError(_error: Error) {
 
 export default (app: Express) => {
   // This pool runs as the database owner, so it can do anything.
-  const rootPgPool = new Pool({
-    connectionString: process.env.DATABASE_URL,
-  });
+  const rootPgPool = new Pool(parse(process.env.DATABASE_URL!) as any);
   rootPgPool.on("error", swallowPoolError);
   app.set("rootPgPool", rootPgPool);
 
   // This pool runs as the unprivileged user, it's what PostGraphile uses.
-  const authPgPool = new Pool({
-    connectionString: process.env.AUTH_DATABASE_URL,
-  });
+  const authPgPool = new Pool(parse(process.env.AUTH_DATABASE_URL!) as any);
   authPgPool.on("error", swallowPoolError);
   app.set("authPgPool", authPgPool);
 

@app/worker/package.json

@@ -3,10 +3,10 @@
   "private": true,
   "version": "0.0.0",
   "scripts": {
-    "gw": "cd dist && node -r @app/config/env ../node_modules/.bin/graphile-worker",
+    "gw": "node -r @app/config/env dist/index.js",
     "build": "tsc -b",
     "start": "yarn gw",
-    "dev": "cd dist && node -r @app/config/env --inspect=9757 ../node_modules/.bin/graphile-worker --watch",
+    "dev": "node -r @app/config/env --inspect=9757 dist/index.js --watch",
     "install-db-schema": "mkdir -p dist && yarn gw --schema-only"
   },
   "dependencies": {
@@ -22,6 +22,8 @@
     "lodash": "^4.17.15",
     "mjml": "^4.6.2",
     "nodemailer": "^6.4.6",
+    "pg": "^8.0.3",
+    "pg-connection-string": "^2.2.0",
     "tslib": "^1.11.1"
   }
 }

@app/worker/src/index.ts

@@ -0,0 +1,41 @@
+import { getTasks, run, runMigrations } from "graphile-worker";
+import { Pool } from "pg";
+import { parse } from "pg-connection-string";
+
+/*
+ * Normally you'd use the CLI, but we need to use pg-connection-string >= 2.1.0,
+ * and pg only uses 0.1.3 so we have to drop to library mode.
+ */
+
+async function main() {
+  const pgPool = new Pool(parse(process.env.DATABASE_URL!) as any);
+  try {
+    const options = { pgPool };
+    const schemaOnly = process.argv.includes("--schema-only");
+    if (schemaOnly) {
+      return await runMigrations(options);
+    }
+    const watch = process.argv.includes("--watch");
+    const { tasks, release } = await getTasks(
+      options,
+      `${__dirname}/tasks`,
+      watch
+    );
+    try {
+      const { promise } = await run({
+        ...options,
+        taskList: tasks,
+      });
+      return await promise;
+    } finally {
+      release();
+    }
+  } finally {
+    pgPool.end();
+  }
+}
+
+main().catch((err) => {
+  console.error(err);
+  process.exit(1);
+});

yarn.lock

@@ -12329,7 +12329,7 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7"
   integrity sha1-2hhHsglA5C7hSSvq9l1J2RskXfc=
 
-pg-connection-string@^2.0.0, pg-connection-string@^2.1.0:
+pg-connection-string@^2.0.0, pg-connection-string@^2.1.0, pg-connection-string@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.2.0.tgz#caab4d38a9de4fdc29c9317acceed752897de41c"
   integrity sha512-xB/+wxcpFipUZOQcSzcgkjcNOosGhEoPSjz06jC89lv1dj7mc9bZv6wLVy8M2fVjP0a/xN0N988YDq1L0FhK3A==