fix: use the correct generation for tests

Author: Xetera

src/remote/remote-controller.test.ts

@@ -40,7 +40,7 @@ test("controller syncs correctly", async () => {
       expect(syncResult.status).toEqual(200);
 
       const pool = new Pool({
-        connectionString: target.withDatabaseName(Remote.defaultOptimizingDbPrefix).toString(),
+        connectionString: innerRemote.optimizingDb.toString(),
       });
       const tablesAfter =
         await pool.query("select tablename from pg_tables where schemaname = 'public'");
@@ -90,7 +90,7 @@ test("creating an index via endpoint adds it to the optimizing db", async () =>
       expect(syncResult.status).toEqual(200);
 
       const pool = new Pool({
-        connectionString: target.withDatabaseName(Remote.defaultOptimizingDbPrefix).toString(),
+        connectionString: innerRemote.optimizingDb.toString(),
       });
 
       // Verify no indexes exist initially

src/remote/remote.test.ts

@@ -7,7 +7,6 @@ import { Pool } from "pg";
 import { ConnectionManager } from "../sync/connection-manager.ts";
 import { normalizeQuery } from "./test-utils.ts";
 
-import { PgIdentifier } from "@query-doctor/core";
 import { type Op } from "jsondiffpatch/formatters/jsonpatch";
 
 const TEST_TARGET_CONTAINER_NAME = "postgres:17";
@@ -94,7 +93,7 @@ test("syncs correctly", async () => {
       expect(indexNames).toEqual(expect.arrayContaining(["testing_1234"]));
 
       const pool = new Pool({
-        connectionString: target.withDatabaseName(Remote.defaultOptimizingDbPrefix).toString(),
+        connectionString: remote.optimizingDb.toString(),
       });
 
       const indexesAfter =
@@ -203,10 +202,8 @@ test("raw timescaledb syncs correctly", async () => {
     try {
       await using remote = new Remote(targetConn, manager);
 
-      const t = manager.getOrCreateConnection(
-        targetConn.withDatabaseName(PgIdentifier.fromString("optimizing_db")),
-      );
       await remote.syncFrom(sourceConn);
+      const t = manager.getOrCreateConnection(remote.optimizingDb);
       const indexesAfter = await t.exec(
         "select indexname from pg_indexes where schemaname = 'public'",
       );
@@ -349,10 +346,8 @@ test("timescaledb with continuous aggregates sync correctly", async () => {
     try {
       await using remote = new Remote(targetConn, manager);
 
-      const t = manager.getOrCreateConnection(
-        targetConn.withDatabaseName(PgIdentifier.fromString("optimizing_db")),
-      );
       await remote.syncFrom(sourceConn);
+      const t = manager.getOrCreateConnection(remote.optimizingDb);
       const queries = remote.optimizer.getQueries();
       const queryStrings = queries.map((q) => normalizeQuery(q.query));
 

src/remote/remote.ts

@@ -36,7 +36,7 @@ type RemoteEvents = {
 export class Remote extends EventEmitter<RemoteEvents> {
   static readonly baseDbName = PgIdentifier.fromString("postgres");
   private static readonly optimizingDbPrefix = "optimizing_db";
-  static defaultOptimizingDbPrefix = PgIdentifier.fromString(`${Remote.optimizingDbPrefix}_0`)
+  static defaultOptimizingDbPrefix = PgIdentifier.fromString(Remote.optimizingDbPrefix)
 
   /* Threshold that we determine is "too few rows" for Postgres to start using indexes
    * and not defaulting to table scan.
@@ -59,6 +59,10 @@ export class Remote extends EventEmitter<RemoteEvents> {
   /** The URL of the current generation optimizing db */
   private optimizingDbUDRL: Connectable;
 
+  get optimizingDb(): Connectable {
+    return this.optimizingDbUDRL;
+  }
+
   private isPolling = false;
   private queryLoader?: QueryLoader;
   private schemaLoader?: SchemaLoader;
@@ -213,18 +217,20 @@ export class Remote extends EventEmitter<RemoteEvents> {
     }
   }
 
+  private generationDbName(generation: number): PgIdentifier {
+    return generation === 0
+      ? Remote.defaultOptimizingDbPrefix
+      : PgIdentifier.fromString(`${Remote.optimizingDbPrefix}_${generation}`);
+  }
+
   private async resetDatabase(): Promise<void> {
     const prevGeneration = this.generation;
     const nextGeneration = prevGeneration + 1;
-    const nextDbName = PgIdentifier.fromString(
-      `${Remote.optimizingDbPrefix}_${nextGeneration}`,
-    );
+    const nextDbName = this.generationDbName(nextGeneration);
     log.info(`Creating new generation database: ${nextDbName}`, "remote");
     const baseDb = this.manager.getOrCreateConnection(this.baseDbURL);
     await baseDb.exec(`create database ${nextDbName};`);
-    const prevDbName = PgIdentifier.fromString(
-      `${Remote.optimizingDbPrefix}_${prevGeneration}`,
-    );
+    const prevDbName = this.generationDbName(prevGeneration);
     this.generation = nextGeneration;
     this.optimizingDbUDRL = this.optimizingDbUDRL.withDatabaseName(nextDbName);
     this.optimizer.updateConnectable(this.optimizingDbUDRL);