@rvoh/dream 0.44.7 → 0.44.8

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

@@ -1,81 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const index_js_1 = require("../cli/index.js");
-const index_js_2 = require("../dream-app/index.js");
-const EnvInternal_js_1 = require("../helpers/EnvInternal.js");
-const SchemaBuilder_js_1 = require("../helpers/cli/SchemaBuilder.js");
+const Query_js_1 = require("../dream/Query.js");
 const generateDream_js_1 = require("../helpers/cli/generateDream.js");
-const generateMigration_js_1 = require("../helpers/cli/generateMigration.js");
-const createDb_js_1 = require("../helpers/db/createDb.js");
-const dropDb_js_1 = require("../helpers/db/dropDb.js");
-const loadPgClient_js_1 = require("../helpers/db/loadPgClient.js");
-const runMigration_js_1 = require("../helpers/db/runMigration.js");
 const sspawn_js_1 = require("../helpers/sspawn.js");
-const sync_js_1 = require("./helpers/sync.js");
 class DreamBin {
     static async sync(onSync) {
-        index_js_1.default.logger.logStartProgress('writing db schema...');
-        await (0, sync_js_1.default)();
-        index_js_1.default.logger.logEndProgress();
-        index_js_1.default.logger.logStartProgress('building dream schema...');
-        await this.buildDreamSchema();
-        index_js_1.default.logger.logEndProgress();
-        // intentionally leaving logs off here, since it allows other
-        // onSync handlers to determine their own independent logging approach
-        await onSync();
-    }
-    static async buildDreamSchema() {
-        await new SchemaBuilder_js_1.default().build();
+        await Query_js_1.default.dbDriverClass().sync(onSync);
     }
     static async dbCreate() {
-        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();
-        // TODO: add support for creating replicas. Began doing it below, but it is very tricky,
-        // and we don't need it at the moment, so kicking off for future development when we have more time
-        // to flesh this out.
-        // if (connectionRetriever.hasReplicaConfig()) {
-        //   const replicaDbConf = connectionRetriever.getConnectionConf('replica')
-        //   console.log(`creating ${process.env[replicaDbConf.name]}`)
-        //   await createDb('replica')
-        // }
+        await Query_js_1.default.dbDriverClass().dbCreate();
     }
     static async dbDrop() {
-        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();
-        // TODO: add support for dropping replicas. Began doing it below, but it is very tricky,
-        // and we don't need it at the moment, so kicking off for future development when we have more time
-        // to flesh this out.
-        // if (connectionRetriever.hasReplicaConfig()) {
-        //   const replicaDbConf = connectionRetriever.getConnectionConf('replica')
-        //   console.log(`dropping ${process.env[replicaDbConf.name]}`)
-        //   await _dropDb('replica')
-        // }
+        await Query_js_1.default.dbDriverClass().dbDrop();
     }
     static async dbMigrate() {
-        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' });
-        index_js_1.default.logger.logEndProgress();
-        await this.duplicateDatabase();
+        await Query_js_1.default.dbDriverClass().migrate();
     }
     static async dbRollback(opts) {
-        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;
-        }
-        index_js_1.default.logger.logEndProgress();
-        await this.duplicateDatabase();
+        await Query_js_1.default.dbDriverClass().rollback(opts);
     }
     static async generateDream(fullyQualifiedModelName, columnsWithTypes, options) {
         await (0, generateDream_js_1.default)({ fullyQualifiedModelName, columnsWithTypes, options });
@@ -89,7 +32,7 @@ class DreamBin {
         });
     }
     static async generateMigration(migrationName, columnsWithTypes) {
-        await (0, generateMigration_js_1.default)({ migrationName, columnsWithTypes });
+        await Query_js_1.default.dbDriverClass().generateMigration(migrationName, columnsWithTypes);
     }
     // though this is a private method, it is still used internally.
     // It is only made private so that people don't mistakenly try
@@ -99,28 +42,5 @@ class DreamBin {
         await (0, sspawn_js_1.default)('yarn typedoc src/index.ts --tsconfig ./tsconfig.esm.build.json --out docs');
         index_js_1.default.logger.logEndProgress();
     }
-    static async duplicateDatabase() {
-        const dreamApp = index_js_2.default.getOrFail();
-        const parallelTests = dreamApp.parallelTests;
-        if (!parallelTests)
-            return;
-        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}...`, { 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}`;
-            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/dream/LeftJoinLoadBuilder.js

@@ -67,7 +67,7 @@ class LeftJoinLoadBuilder {
             const associationMetadata = this.dream['getAssociationMetadata'](associationName);
             if (associationMetadata === undefined)
                 throw new UnexpectedUndefined_js_1.default();
-            this.query['hydrateAssociation']([this.dream], associationMetadata, this.associationToPreloadedDreamsAndWhatTheyPointTo({
+            this.query.dbDriverInstance()['hydrateAssociation']([this.dream], associationMetadata, this.associationToPreloadedDreamsAndWhatTheyPointTo({
                 pointsToPrimaryKey: this.dream.primaryKeyValue,
                 associatedModels: dreamWithLoadedAssociations[associationName],
             }));

package/dist/cjs/src/dream/LoadBuilder.js

@@ -61,7 +61,7 @@ class LoadBuilder {
         if (this.dreamTransaction) {
             this.query = this.query.txn(this.dreamTransaction);
         }
-        await this.query['hydratePreload'](this.dream);
+        await this.query.dbDriverInstance()['hydratePreload'](this.dream);
         return this.dream;
     }
 }