@rvoh/dream 0.35.0 → 0.35.2

package/dist/cjs/src/Dream.js

@@ -46,6 +46,7 @@ const DateTime_js_1 = require("./helpers/DateTime.js");
 const cachedTypeForAttribute_js_1 = require("./helpers/db/cachedTypeForAttribute.js");
 const isJsonColumn_js_1 = require("./helpers/db/types/isJsonColumn.js");
 const inferSerializerFromDreamOrViewModel_js_1 = require("./helpers/inferSerializerFromDreamOrViewModel.js");
+const notEqual_js_1 = require("./helpers/notEqual.js");
 const typechecks_js_1 = require("./helpers/typechecks.js");
 class Dream {
     DB;
@@ -1233,18 +1234,7 @@ class Dream {
      * @returns A Kysely query. Depending on the type passed, it will return either a SelectQueryBuilder, DeleteQueryBuilder, UpdateQueryBuilder, or an InsertQueryBuilder
      */
     static toKysely(type) {
-        switch (type) {
-            case 'select':
-                return this.query().dbFor('select').selectFrom(this.table);
-            case 'delete':
-                return this.query().dbFor('delete').deleteFrom(this.table);
-            case 'update':
-                return this.query().dbFor('update').updateTable(this.table);
-            case 'insert':
-                return this.query().dbFor('insert').insertInto(this.table);
-            default:
-                throw new Error('never');
-        }
+        return this.query().toKysely(type);
     }
     /**
      * Applies transaction to a new Query scoped
@@ -2249,13 +2239,8 @@ class Dream {
         this.constructor.columns().forEach(column => {
             const was = this.previousValueForAttribute(column);
             const now = this[column];
-            if (was !== now) {
-                ;
-                obj[column] = {
-                    was,
-                    now,
-                };
-            }
+            if ((0, notEqual_js_1.default)(was, now))
+                obj[column] = { was, now };
         });
         return obj;
     }
@@ -2289,7 +2274,7 @@ class Dream {
      * @returns Returns the previous value for an attribute
      */
     previousValueForAttribute(columnName) {
-        if (this.frozenAttributes[columnName] !== this[columnName])
+        if ((0, notEqual_js_1.default)(this.frozenAttributes[columnName], this[columnName]))
             return this.frozenAttributes[columnName];
         return this.attributesFromBeforeLastSave[columnName];
     }
@@ -2305,7 +2290,7 @@ class Dream {
         const changes = this.changes();
         const now = changes?.[columnName]?.now;
         const was = changes?.[columnName]?.was;
-        return this.isPersisted && now !== was;
+        return this.isPersisted && (0, notEqual_js_1.default)(now, was);
     }
     /**
      * Returns true if the columnName provided has
@@ -2488,7 +2473,12 @@ class Dream {
      * @returns A boolean
      */
     equals(other) {
-        return other?.constructor === this.constructor && other.primaryKeyValue === this.primaryKeyValue;
+        if (!other?.isDreamInstance)
+            return false;
+        return this.comparisonKey === other.comparisonKey;
+    }
+    get comparisonKey() {
+        return `${this.constructor.globalName}:${this.primaryKeyValue}`;
     }
     /**
      * @internal

package/dist/cjs/src/bin/helpers/sync.js

@@ -5,17 +5,16 @@ const fs = require("fs/promises");
 const path = require("path");
 const index_js_1 = require("../../cli/index.js");
 const colorize_js_1 = require("../../cli/logger/loggable/colorize.js");
-const ConnectionConfRetriever_js_1 = require("../../db/ConnectionConfRetriever.js");
 const index_js_2 = require("../../dream-application/index.js");
+const autoGeneratedFileDisclaimer_js_1 = require("../../helpers/cli/autoGeneratedFileDisclaimer.js");
 const compact_js_1 = require("../../helpers/compact.js");
 const EnvInternal_js_1 = require("../../helpers/EnvInternal.js");
 const dreamPath_js_1 = require("../../helpers/path/dreamPath.js");
 const snakeify_js_1 = require("../../helpers/snakeify.js");
 const sspawn_js_1 = require("../../helpers/sspawn.js");
-const autoGeneratedFileDisclaimer_js_1 = require("../../helpers/cli/autoGeneratedFileDisclaimer.js");
 async function writeSyncFile() {
-    const dbConf = new ConnectionConfRetriever_js_1.default().getConnectionConf('primary');
     const dreamApp = index_js_2.default.getOrFail();
+    const dbConf = dreamApp.dbConnectionConfig('primary');
     const dbSyncFilePath = path.join((0, dreamPath_js_1.default)('types'), 'db.ts');
     const absoluteDbSyncPath = path.join(dreamApp.projectRoot, dbSyncFilePath);
     await (0, sspawn_js_1.default)(`kysely-codegen --dialect=postgres --url=postgres://${dbConf.user}:${dbConf.password}@${dbConf.host}:${dbConf.port}/${dbConf.name} --out-file=${absoluteDbSyncPath}`, {

package/dist/cjs/src/bin/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const index_js_1 = require("../cli/index.js");
-const ConnectionConfRetriever_js_1 = require("../db/ConnectionConfRetriever.js");
 const index_js_2 = require("../dream-application/index.js");
 const EnvInternal_js_1 = require("../helpers/EnvInternal.js");
 const SchemaBuilder_js_1 = require("../helpers/cli/SchemaBuilder.js");
@@ -29,8 +28,8 @@ class DreamBin {
         await new SchemaBuilder_js_1.default().build();
     }
     static async dbCreate() {
-        const connectionRetriever = new ConnectionConfRetriever_js_1.default();
-        const primaryDbConf = connectionRetriever.getConnectionConf('primary');
+        const dreamApp = index_js_2.default.getOrFail();
+        const primaryDbConf = dreamApp.dbConnectionConfig('primary');
         index_js_1.default.logger.logStartProgress(`creating ${primaryDbConf.name}...`);
         await (0, createDb_js_1.default)('primary');
         index_js_1.default.logger.logEndProgress();
@@ -44,8 +43,8 @@ class DreamBin {
         // }
     }
     static async dbDrop() {
-        const connectionRetriever = new ConnectionConfRetriever_js_1.default();
-        const primaryDbConf = connectionRetriever.getConnectionConf('primary');
+        const dreamApp = index_js_2.default.getOrFail();
+        const primaryDbConf = dreamApp.dbConnectionConfig('primary');
         index_js_1.default.logger.logStartProgress(`dropping ${primaryDbConf.name}...`);
         await (0, dropDb_js_1.default)('primary');
         index_js_1.default.logger.logEndProgress();
@@ -59,24 +58,24 @@ class DreamBin {
         // }
     }
     static async dbMigrate() {
-        const connectionRetriever = new ConnectionConfRetriever_js_1.default();
-        const primaryDbConf = connectionRetriever.getConnectionConf('primary');
+        const dreamApp = index_js_2.default.getOrFail();
+        const primaryDbConf = dreamApp.dbConnectionConfig('primary');
         index_js_1.default.logger.logStartProgress(`migrating ${primaryDbConf.name}...`);
         await (0, runMigration_js_1.default)({ mode: 'migrate' });
-        await this.duplicateDatabase();
         index_js_1.default.logger.logEndProgress();
+        await this.duplicateDatabase();
     }
     static async dbRollback(opts) {
-        const connectionRetriever = new ConnectionConfRetriever_js_1.default();
-        const primaryDbConf = connectionRetriever.getConnectionConf('primary');
+        const dreamApp = index_js_2.default.getOrFail();
+        const primaryDbConf = dreamApp.dbConnectionConfig('primary');
         index_js_1.default.logger.logStartProgress(`rolling back ${primaryDbConf.name}...`);
         let step = opts.steps;
         while (step > 0) {
             await (0, runMigration_js_1.default)({ mode: 'rollback' });
             step -= 1;
         }
-        await this.duplicateDatabase();
         index_js_1.default.logger.logEndProgress();
+        await this.duplicateDatabase();
     }
     static async generateDream(fullyQualifiedModelName, columnsWithTypes, options) {
         await (0, generateDream_js_1.default)({ fullyQualifiedModelName, columnsWithTypes, options });
@@ -96,26 +95,27 @@ class DreamBin {
         index_js_1.default.logger.logEndProgress();
     }
     static async duplicateDatabase() {
-        const parallelTests = index_js_2.default.getOrFail().parallelTests;
+        const dreamApp = index_js_2.default.getOrFail();
+        const parallelTests = dreamApp.parallelTests;
         if (!parallelTests)
             return;
-        const connectionRetriever = new ConnectionConfRetriever_js_1.default();
-        const dbConf = connectionRetriever.getConnectionConf('primary');
+        index_js_1.default.logger.logStartProgress(`duplicating db for parallel tests...`);
+        const dbConf = dreamApp.dbConnectionConfig('primary');
         const client = await (0, loadPgClient_js_1.default)({ useSystemDb: true });
         if (EnvInternal_js_1.default.boolean('DREAM_CORE_DEVELOPMENT')) {
             const replicaTestWorkerDatabaseName = `replica_test_${dbConf.name}`;
-            index_js_1.default.logger.logContinueProgress(`creating fake replica test database ${replicaTestWorkerDatabaseName}...`);
+            index_js_1.default.logger.logContinueProgress(`creating fake replica test database ${replicaTestWorkerDatabaseName}...`, { logPrefix: '  ├ [db]', logPrefixColor: 'cyan' });
             await client.query(`DROP DATABASE IF EXISTS ${replicaTestWorkerDatabaseName};`);
             await client.query(`CREATE DATABASE ${replicaTestWorkerDatabaseName} TEMPLATE ${dbConf.name};`);
         }
         for (let i = 2; i <= parallelTests; i++) {
             const workerDatabaseName = `${dbConf.name}_${i}`;
-            console.log(`creating duplicate test database ${workerDatabaseName} for concurrent tests`);
-            index_js_1.default.logger.logContinueProgress(`creating duplicate test database ${workerDatabaseName} for concurrent tests...`);
+            index_js_1.default.logger.logContinueProgress(`creating duplicate test database ${workerDatabaseName} for concurrent tests...`, { logPrefix: '  ├ [db]', logPrefixColor: 'cyan' });
             await client.query(`DROP DATABASE IF EXISTS ${workerDatabaseName};`);
             await client.query(`CREATE DATABASE ${workerDatabaseName} TEMPLATE ${dbConf.name};`);
         }
         await client.end();
+        index_js_1.default.logger.logEndProgress();
     }
 }
 exports.default = DreamBin;

package/dist/cjs/src/db/DreamDbConnection.js

@@ -13,16 +13,16 @@ exports.closeAllDbConnections = closeAllDbConnections;
 const pg_1 = require("pg");
 const kysely_1 = require("kysely");
 const index_js_1 = require("../dream-application/index.js");
-const ConnectionConfRetriever_js_1 = require("./ConnectionConfRetriever.js");
 let connections = {};
 class DreamDbConnection {
     static getConnection(connectionType) {
-        const connectionName = getConnectionTypeName(connectionType);
+        const dreamApp = index_js_1.default.getOrFail();
+        const connectionName = this.getConnectionTypeName(connectionType);
         const connection = connections[connectionName];
         if (connection) {
             return connection;
         }
-        const connectionConf = new ConnectionConfRetriever_js_1.default().getConnectionConf(connectionType);
+        const connectionConf = dreamApp.dbConnectionConfig(connectionType);
         const dbConn = new kysely_1.Kysely({
             log(event) {
                 const dreamApp = index_js_1.default.getOrFail();
@@ -34,7 +34,7 @@ class DreamDbConnection {
                 pool: new pg_1.default.Pool({
                     user: connectionConf.user || '',
                     password: connectionConf.password || '',
-                    database: getDatabaseName(connectionConf.name),
+                    database: dreamApp.dbName(connectionType),
                     host: connectionConf.host || 'localhost',
                     port: connectionConf.port || 5432,
                     ssl: connectionConf.useSsl ? sslConfig(connectionConf) : false,
@@ -42,7 +42,7 @@ class DreamDbConnection {
             }),
             plugins: [new kysely_1.CamelCasePlugin({ underscoreBetweenUppercaseLetters: true })],
         });
-        connections[getConnectionTypeName(connectionType)] = dbConn;
+        connections[this.getConnectionTypeName(connectionType)] = dbConn;
         return dbConn;
     }
     static async dropAllConnections() {
@@ -51,19 +51,13 @@ class DreamDbConnection {
             delete connections[key];
         }
     }
+    static getConnectionTypeName(connectionType) {
+        return index_js_1.default.getOrFail().parallelDatabasesEnabled
+            ? `${connectionType}_${process.env.VITEST_POOL_ID}`
+            : connectionType;
+    }
 }
 exports.default = DreamDbConnection;
-function getConnectionTypeName(connectionType) {
-    return parallelDatabasesEnabled() ? `${connectionType}_${process.env.JEST_WORKER_ID}` : connectionType;
-}
-function getDatabaseName(dbName) {
-    return parallelDatabasesEnabled() ? `${dbName}_${process.env.JEST_WORKER_ID}` : dbName;
-}
-function parallelDatabasesEnabled() {
-    return (!!index_js_1.default.getOrFail().parallelTests &&
-        !Number.isNaN(Number(process.env.JEST_WORKER_ID)) &&
-        Number(process.env.JEST_WORKER_ID) > 1);
-}
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 function sslConfig(connectionConf) {
     // TODO: properly configure (https://rvohealth.atlassian.net/browse/PDTC-2914)

package/dist/cjs/src/dream-application/index.js

@@ -228,6 +228,28 @@ Try setting it to something valid, like:
     get serializers() {
         return (0, importSerializers_js_1.getSerializersOrFail)();
     }
+    dbName(connection) {
+        const conf = this.dbConnectionConfig(connection);
+        return this.parallelDatabasesEnabled ? `${conf.name}_${process.env.VITEST_POOL_ID}` : conf.name;
+    }
+    dbConnectionConfig(connection) {
+        const conf = this.dbCredentials?.[connection] || this.dbCredentials?.primary;
+        if (!conf)
+            throw new Error(`
+      Cannot find a connection config given the following connection and node environment:
+        connection: ${connection}
+        NODE_ENV: ${EnvInternal_js_1.default.nodeEnv}
+    `);
+        return conf;
+    }
+    get hasReplicaConfig() {
+        return !!this.dbCredentials.replica;
+    }
+    get parallelDatabasesEnabled() {
+        return (!!this.parallelTests &&
+            !Number.isNaN(Number(process.env.VITEST_POOL_ID)) &&
+            Number(process.env.VITEST_POOL_ID) > 1);
+    }
     async load(resourceType, resourcePath, importCb) {
         switch (resourceType) {
             case 'models':

package/dist/cjs/src/helpers/areEqual.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = areEqual;
+const CalendarDate_js_1 = require("./CalendarDate.js");
+const DateTime_js_1 = require("./DateTime.js");
+function areEqual(a, b) {
+    return areEqualOrUndefined(a, b) ?? areEqualOrUndefined(b, a) ?? JSON.stringify(a) === JSON.stringify(b);
+}
+function areEqualOrUndefined(a, b) {
+    if (a === null)
+        return b === null;
+    if (a === undefined)
+        return b === undefined;
+    if (typeof a === 'boolean')
+        return a === b;
+    if (typeof a === 'number')
+        return a === b;
+    if (typeof a === 'string')
+        return a === b;
+    if (a instanceof DateTime_js_1.DateTime)
+        return b instanceof DateTime_js_1.DateTime && a.equals(b);
+    if (a instanceof CalendarDate_js_1.default)
+        return b instanceof CalendarDate_js_1.default && a.equals(b);
+    if (Array.isArray(a))
+        return Array.isArray(b) && a.length === b.length && !a.find((value, index) => !areEqual(value, b[index]));
+    if (a?.isDreamInstance)
+        return a.equals(b);
+    return undefined;
+}

package/dist/cjs/src/helpers/db/createDb.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = createDb;
-const ConnectionConfRetriever_js_1 = require("../../db/ConnectionConfRetriever.js");
+const index_js_1 = require("../../dream-application/index.js");
 const EnvInternal_js_1 = require("../EnvInternal.js");
 const loadPgClient_js_1 = require("./loadPgClient.js");
 async function createDb(connection, dbName) {
@@ -9,8 +9,8 @@ async function createDb(connection, dbName) {
     // so there is no way to drop in production
     if (EnvInternal_js_1.default.isProduction)
         return false;
-    const connectionRetriever = new ConnectionConfRetriever_js_1.default();
-    const dbConf = connectionRetriever.getConnectionConf(connection);
+    const dreamApp = index_js_1.default.getOrFail();
+    const dbConf = dreamApp.dbConnectionConfig(connection);
     dbName ||= dbConf.name || null;
     if (!dbName)
         throw new Error('Must either pass a dbName to the create function, or else ensure that DB_NAME is set in the env');

package/dist/cjs/src/helpers/db/dropDb.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = dropDb;
-const ConnectionConfRetriever_js_1 = require("../../db/ConnectionConfRetriever.js");
 const index_js_1 = require("../../dream-application/index.js");
 const EnvInternal_js_1 = require("../EnvInternal.js");
 const loadPgClient_js_1 = require("./loadPgClient.js");
+const index_js_2 = require("../../cli/index.js");
 async function dropDb(connection, dbName) {
     // this was only ever written to clear the db between tests or in development,
     // so there is no way to drop in production
     if (EnvInternal_js_1.default.isProduction)
         return false;
-    const connectionRetriever = new ConnectionConfRetriever_js_1.default();
-    const dbConf = connectionRetriever.getConnectionConf(connection);
+    const dreamApp = index_js_1.default.getOrFail();
+    const dbConf = dreamApp.dbConnectionConfig(connection);
     dbName ||= dbConf.name || null;
     if (!dbName)
         throw new Error('Must either pass a dbName to the drop function, or else ensure that DB_NAME is set in the env');
@@ -25,12 +25,15 @@ async function maybeDropDuplicateDatabases(client, dbName) {
         return;
     if (EnvInternal_js_1.default.boolean('DREAM_CORE_DEVELOPMENT')) {
         const replicaTestWorkerDatabaseName = `replica_test_${dbName}`;
-        console.log(`dropping fake replica test database ${replicaTestWorkerDatabaseName}`);
+        index_js_2.default.logger.logContinueProgress(`dropping fake replica test database ${replicaTestWorkerDatabaseName}`, { logPrefix: '  ├ [db]', logPrefixColor: 'cyan' });
         await client.query(`DROP DATABASE IF EXISTS ${replicaTestWorkerDatabaseName};`);
     }
     for (let i = 2; i <= parallelTests; i++) {
         const workerDatabaseName = `${dbName}_${i}`;
-        console.log(`dropping duplicate test database ${workerDatabaseName}`);
+        index_js_2.default.logger.logContinueProgress(`dropping duplicate test database ${workerDatabaseName}`, {
+            logPrefix: '  ├ [db]',
+            logPrefixColor: 'cyan',
+        });
         await client.query(`DROP DATABASE IF EXISTS ${workerDatabaseName};`);
     }
 }

package/dist/cjs/src/helpers/notEqual.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const areEqual_js_1 = require("./areEqual.js");
+function default_1(a, b) {
+    return !(0, areEqual_js_1.default)(a, b);
+}

package/dist/cjs/src/helpers/uniq.js

@@ -6,15 +6,14 @@ function uniq(arr, toKey = undefined) {
         return uniqWith(arr, toKey);
     return uniqWith(arr, a => String(a));
 }
-function dreamKey(dream) {
-    return `${dream.constructor.globalName}:${dream.primaryKeyValue}`;
-}
 function uniqWith(arr, toKey) {
     const map = arr.reduce((acc, val) => {
         // Prefix with underscore to ensure that the values cannot be interpreted as integers.
         // If they can be interpreted as integers, then the keys are ordered not by the
         // order in which they were added, but in ascending numerical order.
-        const key = val?.isDreamInstance ? dreamKey(val) : `_${toKey(val)}`;
+        const key = val?.isDreamInstance
+            ? val.comparisonKey
+            : `_${toKey(val)}`;
         acc[key] ||= val;
         return acc;
     }, {});

package/dist/esm/src/Dream.js

@@ -44,6 +44,7 @@ import { DateTime } from './helpers/DateTime.js';
 import cachedTypeForAttribute from './helpers/db/cachedTypeForAttribute.js';
 import isJsonColumn from './helpers/db/types/isJsonColumn.js';
 import inferSerializerFromDreamOrViewModel from './helpers/inferSerializerFromDreamOrViewModel.js';
+import notEqual from './helpers/notEqual.js';
 import { isString } from './helpers/typechecks.js';
 export default class Dream {
     DB;
@@ -1231,18 +1232,7 @@ export default class Dream {
      * @returns A Kysely query. Depending on the type passed, it will return either a SelectQueryBuilder, DeleteQueryBuilder, UpdateQueryBuilder, or an InsertQueryBuilder
      */
     static toKysely(type) {
-        switch (type) {
-            case 'select':
-                return this.query().dbFor('select').selectFrom(this.table);
-            case 'delete':
-                return this.query().dbFor('delete').deleteFrom(this.table);
-            case 'update':
-                return this.query().dbFor('update').updateTable(this.table);
-            case 'insert':
-                return this.query().dbFor('insert').insertInto(this.table);
-            default:
-                throw new Error('never');
-        }
+        return this.query().toKysely(type);
     }
     /**
      * Applies transaction to a new Query scoped
@@ -2247,13 +2237,8 @@ export default class Dream {
         this.constructor.columns().forEach(column => {
             const was = this.previousValueForAttribute(column);
             const now = this[column];
-            if (was !== now) {
-                ;
-                obj[column] = {
-                    was,
-                    now,
-                };
-            }
+            if (notEqual(was, now))
+                obj[column] = { was, now };
         });
         return obj;
     }
@@ -2287,7 +2272,7 @@ export default class Dream {
      * @returns Returns the previous value for an attribute
      */
     previousValueForAttribute(columnName) {
-        if (this.frozenAttributes[columnName] !== this[columnName])
+        if (notEqual(this.frozenAttributes[columnName], this[columnName]))
             return this.frozenAttributes[columnName];
         return this.attributesFromBeforeLastSave[columnName];
     }
@@ -2303,7 +2288,7 @@ export default class Dream {
         const changes = this.changes();
         const now = changes?.[columnName]?.now;
         const was = changes?.[columnName]?.was;
-        return this.isPersisted && now !== was;
+        return this.isPersisted && notEqual(now, was);
     }
     /**
      * Returns true if the columnName provided has
@@ -2486,7 +2471,12 @@ export default class Dream {
      * @returns A boolean
      */
     equals(other) {
-        return other?.constructor === this.constructor && other.primaryKeyValue === this.primaryKeyValue;
+        if (!other?.isDreamInstance)
+            return false;
+        return this.comparisonKey === other.comparisonKey;
+    }
+    get comparisonKey() {
+        return `${this.constructor.globalName}:${this.primaryKeyValue}`;
     }
     /**
      * @internal

package/dist/esm/src/bin/helpers/sync.js

@@ -2,17 +2,16 @@ import * as fs from 'fs/promises';
 import * as path from 'path';
 import DreamCLI from '../../cli/index.js';
 import colorize from '../../cli/logger/loggable/colorize.js';
-import ConnectionConfRetriever from '../../db/ConnectionConfRetriever.js';
 import DreamApplication from '../../dream-application/index.js';
+import autogeneratedFileDisclaimer from '../../helpers/cli/autoGeneratedFileDisclaimer.js';
 import compact from '../../helpers/compact.js';
 import EnvInternal from '../../helpers/EnvInternal.js';
 import dreamPath from '../../helpers/path/dreamPath.js';
 import snakeify from '../../helpers/snakeify.js';
 import sspawn from '../../helpers/sspawn.js';
-import autogeneratedFileDisclaimer from '../../helpers/cli/autoGeneratedFileDisclaimer.js';
 export default async function writeSyncFile() {
-    const dbConf = new ConnectionConfRetriever().getConnectionConf('primary');
     const dreamApp = DreamApplication.getOrFail();
+    const dbConf = dreamApp.dbConnectionConfig('primary');
     const dbSyncFilePath = path.join(dreamPath('types'), 'db.ts');
     const absoluteDbSyncPath = path.join(dreamApp.projectRoot, dbSyncFilePath);
     await sspawn(`kysely-codegen --dialect=postgres --url=postgres://${dbConf.user}:${dbConf.password}@${dbConf.host}:${dbConf.port}/${dbConf.name} --out-file=${absoluteDbSyncPath}`, {

package/dist/esm/src/bin/index.js

@@ -1,5 +1,4 @@
 import DreamCLI from '../cli/index.js';
-import ConnectionConfRetriever from '../db/ConnectionConfRetriever.js';
 import DreamApplication from '../dream-application/index.js';
 import EnvInternal from '../helpers/EnvInternal.js';
 import SchemaBuilder from '../helpers/cli/SchemaBuilder.js';
@@ -27,8 +26,8 @@ export default class DreamBin {
         await new SchemaBuilder().build();
     }
     static async dbCreate() {
-        const connectionRetriever = new ConnectionConfRetriever();
-        const primaryDbConf = connectionRetriever.getConnectionConf('primary');
+        const dreamApp = DreamApplication.getOrFail();
+        const primaryDbConf = dreamApp.dbConnectionConfig('primary');
         DreamCLI.logger.logStartProgress(`creating ${primaryDbConf.name}...`);
         await createDb('primary');
         DreamCLI.logger.logEndProgress();
@@ -42,8 +41,8 @@ export default class DreamBin {
         // }
     }
     static async dbDrop() {
-        const connectionRetriever = new ConnectionConfRetriever();
-        const primaryDbConf = connectionRetriever.getConnectionConf('primary');
+        const dreamApp = DreamApplication.getOrFail();
+        const primaryDbConf = dreamApp.dbConnectionConfig('primary');
         DreamCLI.logger.logStartProgress(`dropping ${primaryDbConf.name}...`);
         await _dropDb('primary');
         DreamCLI.logger.logEndProgress();
@@ -57,24 +56,24 @@ export default class DreamBin {
         // }
     }
     static async dbMigrate() {
-        const connectionRetriever = new ConnectionConfRetriever();
-        const primaryDbConf = connectionRetriever.getConnectionConf('primary');
+        const dreamApp = DreamApplication.getOrFail();
+        const primaryDbConf = dreamApp.dbConnectionConfig('primary');
         DreamCLI.logger.logStartProgress(`migrating ${primaryDbConf.name}...`);
         await runMigration({ mode: 'migrate' });
-        await this.duplicateDatabase();
         DreamCLI.logger.logEndProgress();
+        await this.duplicateDatabase();
     }
     static async dbRollback(opts) {
-        const connectionRetriever = new ConnectionConfRetriever();
-        const primaryDbConf = connectionRetriever.getConnectionConf('primary');
+        const dreamApp = DreamApplication.getOrFail();
+        const primaryDbConf = dreamApp.dbConnectionConfig('primary');
         DreamCLI.logger.logStartProgress(`rolling back ${primaryDbConf.name}...`);
         let step = opts.steps;
         while (step > 0) {
             await runMigration({ mode: 'rollback' });
             step -= 1;
         }
-        await this.duplicateDatabase();
         DreamCLI.logger.logEndProgress();
+        await this.duplicateDatabase();
     }
     static async generateDream(fullyQualifiedModelName, columnsWithTypes, options) {
         await generateDream({ fullyQualifiedModelName, columnsWithTypes, options });
@@ -94,25 +93,26 @@ export default class DreamBin {
         DreamCLI.logger.logEndProgress();
     }
     static async duplicateDatabase() {
-        const parallelTests = DreamApplication.getOrFail().parallelTests;
+        const dreamApp = DreamApplication.getOrFail();
+        const parallelTests = dreamApp.parallelTests;
         if (!parallelTests)
             return;
-        const connectionRetriever = new ConnectionConfRetriever();
-        const dbConf = connectionRetriever.getConnectionConf('primary');
+        DreamCLI.logger.logStartProgress(`duplicating db for parallel tests...`);
+        const dbConf = dreamApp.dbConnectionConfig('primary');
         const client = await loadPgClient({ useSystemDb: true });
         if (EnvInternal.boolean('DREAM_CORE_DEVELOPMENT')) {
             const replicaTestWorkerDatabaseName = `replica_test_${dbConf.name}`;
-            DreamCLI.logger.logContinueProgress(`creating fake replica test database ${replicaTestWorkerDatabaseName}...`);
+            DreamCLI.logger.logContinueProgress(`creating fake replica test database ${replicaTestWorkerDatabaseName}...`, { logPrefix: '  ├ [db]', logPrefixColor: 'cyan' });
             await client.query(`DROP DATABASE IF EXISTS ${replicaTestWorkerDatabaseName};`);
             await client.query(`CREATE DATABASE ${replicaTestWorkerDatabaseName} TEMPLATE ${dbConf.name};`);
         }
         for (let i = 2; i <= parallelTests; i++) {
             const workerDatabaseName = `${dbConf.name}_${i}`;
-            console.log(`creating duplicate test database ${workerDatabaseName} for concurrent tests`);
-            DreamCLI.logger.logContinueProgress(`creating duplicate test database ${workerDatabaseName} for concurrent tests...`);
+            DreamCLI.logger.logContinueProgress(`creating duplicate test database ${workerDatabaseName} for concurrent tests...`, { logPrefix: '  ├ [db]', logPrefixColor: 'cyan' });
             await client.query(`DROP DATABASE IF EXISTS ${workerDatabaseName};`);
             await client.query(`CREATE DATABASE ${workerDatabaseName} TEMPLATE ${dbConf.name};`);
         }
         await client.end();
+        DreamCLI.logger.logEndProgress();
     }
 }

package/dist/esm/src/db/DreamDbConnection.js

@@ -9,16 +9,16 @@
 import pg from 'pg';
 import { CamelCasePlugin, Kysely, PostgresDialect } from 'kysely';
 import DreamApplication from '../dream-application/index.js';
-import ConnectionConfRetriever from './ConnectionConfRetriever.js';
 let connections = {};
 export default class DreamDbConnection {
     static getConnection(connectionType) {
-        const connectionName = getConnectionTypeName(connectionType);
+        const dreamApp = DreamApplication.getOrFail();
+        const connectionName = this.getConnectionTypeName(connectionType);
         const connection = connections[connectionName];
         if (connection) {
             return connection;
         }
-        const connectionConf = new ConnectionConfRetriever().getConnectionConf(connectionType);
+        const connectionConf = dreamApp.dbConnectionConfig(connectionType);
         const dbConn = new Kysely({
             log(event) {
                 const dreamApp = DreamApplication.getOrFail();
@@ -30,7 +30,7 @@ export default class DreamDbConnection {
                 pool: new pg.Pool({
                     user: connectionConf.user || '',
                     password: connectionConf.password || '',
-                    database: getDatabaseName(connectionConf.name),
+                    database: dreamApp.dbName(connectionType),
                     host: connectionConf.host || 'localhost',
                     port: connectionConf.port || 5432,
                     ssl: connectionConf.useSsl ? sslConfig(connectionConf) : false,
@@ -38,7 +38,7 @@ export default class DreamDbConnection {
             }),
             plugins: [new CamelCasePlugin({ underscoreBetweenUppercaseLetters: true })],
         });
-        connections[getConnectionTypeName(connectionType)] = dbConn;
+        connections[this.getConnectionTypeName(connectionType)] = dbConn;
         return dbConn;
     }
     static async dropAllConnections() {
@@ -47,17 +47,11 @@ export default class DreamDbConnection {
             delete connections[key];
         }
     }
-}
-function getConnectionTypeName(connectionType) {
-    return parallelDatabasesEnabled() ? `${connectionType}_${process.env.JEST_WORKER_ID}` : connectionType;
-}
-function getDatabaseName(dbName) {
-    return parallelDatabasesEnabled() ? `${dbName}_${process.env.JEST_WORKER_ID}` : dbName;
-}
-function parallelDatabasesEnabled() {
-    return (!!DreamApplication.getOrFail().parallelTests &&
-        !Number.isNaN(Number(process.env.JEST_WORKER_ID)) &&
-        Number(process.env.JEST_WORKER_ID) > 1);
+    static getConnectionTypeName(connectionType) {
+        return DreamApplication.getOrFail().parallelDatabasesEnabled
+            ? `${connectionType}_${process.env.VITEST_POOL_ID}`
+            : connectionType;
+    }
 }
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 function sslConfig(connectionConf) {