test(run-ops): strip schema comments before parity regexes; dedupe PG17 fixture bootstrap

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: d-cs

internal-packages/run-ops-database/prisma/schema.parity.test.ts

@@ -23,9 +23,16 @@ function readSchema(rel: string) {
   return readFileSync(resolve(__dirname, rel), "utf8");
 }
 
+// Prisma comments (`///` docs and `//` lines) may legitimately mention
+// control-plane model names in prose, which would false-match the drift
+// regexes below. Strip them so parity assertions only see real schema syntax.
+function stripComments(schema: string) {
+  return schema.replace(/\/\/.*$/gm, "");
+}
+
 describe("dedicated run-ops schema parity", () => {
   it("references no control-plane model as a relation target", () => {
-    const dedicated = readSchema("./schema.prisma");
+    const dedicated = stripComments(readSchema("./schema.prisma"));
     for (const model of CONTROL_PLANE_MODELS) {
       // A relation target appears as `  fieldName  Model @relation(...)`. A bare
       // scalar column like `projectId String` is fine; the model TYPE must be absent.
@@ -60,7 +67,7 @@ describe("dedicated run-ops schema parity", () => {
   });
 
   it("keeps the group-(A) waitpoint-block references FK-FREE (scalar columns / explicit FK-free join models)", () => {
-    const dedicated = readSchema("./schema.prisma");
+    const dedicated = stripComments(readSchema("./schema.prisma"));
     // TaskRunWaitpoint must NOT carry a `@relation` to Waitpoint/TaskRun/BatchTaskRun.
     const trw = dedicated.match(/model TaskRunWaitpoint \{[\s\S]*?\n\}/)![0];
     expect(trw).not.toMatch(/@relation/);
@@ -77,7 +84,7 @@ describe("dedicated run-ops schema parity", () => {
   });
 
   it("keeps the group-(B) co-resident references as real FKs (e.g. TaskRunAttempt.taskRun)", () => {
-    const dedicated = readSchema("./schema.prisma");
+    const dedicated = stripComments(readSchema("./schema.prisma"));
     const attempt = dedicated.match(/model TaskRunAttempt \{[\s\S]*?\n\}/)![0];
     // The attempt->run relation stays a real FK (always co-resident).
     expect(attempt).toMatch(/taskRun\s+TaskRun\s+@relation/);

internal-packages/testcontainers/src/index.ts

@@ -176,28 +176,30 @@ export const HETERO_PINNED_ICU_COLLATION = "und-x-icu";
 // PG17 worker singleton mirroring getWorkerPostgresContainer. PG17 supports the ICU cluster locale
 // provider (PG14 does not - it arrived in PG15), so only this side sets the cluster locale; the real
 // cross-version guarantee is the per-column COLLATE in the proof test.
+async function bootstrapPg17TemplateContainer(
+  pushSchema: (databaseUrl: string) => Promise<unknown>
+): Promise<StartedPostgreSqlContainer> {
+  const container = await withCiResourceLimits(new PostgreSqlContainer("docker.io/postgres:17"))
+    .withCommand(["-c", "listen_addresses=*", "-c", "wal_level=logical"])
+    .withEnvironment({
+      POSTGRES_INITDB_ARGS: "--locale-provider=icu --icu-locale=en-US --encoding=UTF8",
+    })
+    .start();
+  const admin = new PrismaClient({
+    datasources: {
+      db: { url: postgresUriWithDatabase(container.getConnectionUri(), "postgres") },
+    },
+  });
+  await admin.$executeRawUnsafe(`CREATE DATABASE "${POSTGRES_TEMPLATE_DB}"`);
+  await admin.$disconnect();
+  await pushSchema(postgresUriWithDatabase(container.getConnectionUri(), POSTGRES_TEMPLATE_DB));
+  return container;
+}
+
 let workerPostgresContainer17: Promise<StartedPostgreSqlContainer> | undefined;
 const getWorkerPostgresContainer17 = () => {
   if (!workerPostgresContainer17) {
-    workerPostgresContainer17 = (async () => {
-      const container = await withCiResourceLimits(new PostgreSqlContainer("docker.io/postgres:17"))
-        .withCommand(["-c", "listen_addresses=*", "-c", "wal_level=logical"])
-        .withEnvironment({
-          POSTGRES_INITDB_ARGS: "--locale-provider=icu --icu-locale=en-US --encoding=UTF8",
-        })
-        .start();
-      const admin = new PrismaClient({
-        datasources: {
-          db: { url: postgresUriWithDatabase(container.getConnectionUri(), "postgres") },
-        },
-      });
-      await admin.$executeRawUnsafe(`CREATE DATABASE "${POSTGRES_TEMPLATE_DB}"`);
-      await admin.$disconnect();
-      await pushDatabaseSchema(
-        postgresUriWithDatabase(container.getConnectionUri(), POSTGRES_TEMPLATE_DB)
-      );
-      return container;
-    })();
+    workerPostgresContainer17 = bootstrapPg17TemplateContainer(pushDatabaseSchema);
   }
   return workerPostgresContainer17;
 };
@@ -209,25 +211,7 @@ const getWorkerPostgresContainer17 = () => {
 let runOpsWorkerPostgresContainer17: Promise<StartedPostgreSqlContainer> | undefined;
 const getRunOpsWorkerPostgresContainer17 = () => {
   if (!runOpsWorkerPostgresContainer17) {
-    runOpsWorkerPostgresContainer17 = (async () => {
-      const container = await withCiResourceLimits(new PostgreSqlContainer("docker.io/postgres:17"))
-        .withCommand(["-c", "listen_addresses=*", "-c", "wal_level=logical"])
-        .withEnvironment({
-          POSTGRES_INITDB_ARGS: "--locale-provider=icu --icu-locale=en-US --encoding=UTF8",
-        })
-        .start();
-      const admin = new PrismaClient({
-        datasources: {
-          db: { url: postgresUriWithDatabase(container.getConnectionUri(), "postgres") },
-        },
-      });
-      await admin.$executeRawUnsafe(`CREATE DATABASE "${POSTGRES_TEMPLATE_DB}"`);
-      await admin.$disconnect();
-      await pushRunOpsSchema(
-        postgresUriWithDatabase(container.getConnectionUri(), POSTGRES_TEMPLATE_DB)
-      );
-      return container;
-    })();
+    runOpsWorkerPostgresContainer17 = bootstrapPg17TemplateContainer(pushRunOpsSchema);
   }
   return runOpsWorkerPostgresContainer17;
 };