Fix yarn server schema:export command via makeSchema (#357)

Co-authored-by: Benjie Gillam <benjie@jemjie.com>

Author: 2 people

@app/server/scripts/schema-export.ts

@@ -1,28 +1,33 @@
 import { writeFileSync } from "fs";
 import { lexicographicSortSchema, printSchema } from "graphql";
 import { Pool } from "pg";
-import { createPostGraphileSchema } from "postgraphile";
+import { makeSchema } from "postgraphile";
 
-import { getPostGraphileOptions } from "../src/graphile.config";
+import { getPreset } from "../src/graphile.config";
 
 async function main() {
-  const rootPgPool = new Pool({
-    connectionString: process.env.DATABASE_URL!,
+  const authPgPool = new Pool({
+    connectionString: process.env.AUTH_DATABASE_URL!,
   });
+  const preset = {
+    extends: [getPreset({ authPgPool })],
+    schema: {
+      // Turn off built-in schema exporting
+      exportSchemaSDLPath: undefined,
+      exportSchemaIntrospectionResultPath: undefined,
+    },
+  };
+
   try {
-    const schema = await createPostGraphileSchema(
-      process.env.AUTH_DATABASE_URL!,
-      "app_public",
-      getPostGraphileOptions({ rootPgPool })
-    );
+    const { schema } = await makeSchema(preset);
     const sorted = lexicographicSortSchema(schema);
     writeFileSync(
       `${__dirname}/../../../data/schema.graphql`,
-      printSchema(sorted)
+      printSchema(sorted) + "\n"
     );
     console.log("GraphQL schema exported");
   } finally {
-    rootPgPool.end();
+    authPgPool.end();
   }
 }
 

@app/server/src/graphile.config.ts

@@ -60,7 +60,7 @@ function uuidOrNull(input: string | number | null | undefined): UUID | null {
 
 interface IPostGraphileOptionsOptions {
   authPgPool: Pool;
-  rootPgPool: Pool;
+  rootPgPool?: Pool;
 }
 
 const isTest = process.env.NODE_ENV === "test";
@@ -222,7 +222,7 @@ export function getPreset({
           const sessionId = uuidOrNull(req.user?.session_id);
           if (sessionId) {
             // Update the last_active timestamp (but only do it at most once every 15 seconds to avoid too much churn).
-            await rootPgPool.query(
+            await rootPgPool?.query(
               "UPDATE app_private.sessions SET last_active = NOW() WHERE uuid = $1 AND last_active < NOW() - INTERVAL '15 seconds'",
               [sessionId]
             );