@rvoh/dream 0.44.7 → 0.44.8

package/dist/cjs/src/dream/QueryDriver/Postgres.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Kysely_js_1 = require("./Kysely.js");
+class PostgresQueryDriver extends Kysely_js_1.default {
+}
+exports.default = PostgresQueryDriver;

package/dist/cjs/src/dream/internal/saveDream.js

@@ -1,15 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = saveDream;
-const index_js_1 = require("../../db/index.js");
 const ValidationError_js_1 = require("../../errors/ValidationError.js");
 const DateTime_js_1 = require("../../helpers/DateTime.js");
-const namespaceColumn_js_1 = require("../../helpers/namespaceColumn.js");
 const sqlAttributes_js_1 = require("../../helpers/sqlAttributes.js");
-const executeDatabaseQuery_js_1 = require("./executeDatabaseQuery.js");
+const Query_js_1 = require("../Query.js");
 const runHooksFor_js_1 = require("./runHooksFor.js");
 async function saveDream(dream, txn = null, { skipHooks = false } = {}) {
-    const db = txn?.kyselyTransaction ?? (0, index_js_1.default)('primary');
     const alreadyPersisted = dream.isPersisted;
     if (!skipHooks) {
         if (alreadyPersisted)
@@ -25,26 +22,16 @@ async function saveDream(dream, txn = null, { skipHooks = false } = {}) {
         throw new ValidationError_js_1.default(dream['sanitizedConstructorName'], dream.errors);
     if (alreadyPersisted && !dream.isDirty)
         return dream;
-    let query;
     const now = DateTime_js_1.DateTime.now();
     if (!alreadyPersisted && !dream.createdAt && dream.columns().has('createdAt'))
         dream.createdAt = now;
     if (!dream.dirtyAttributes().updatedAt && dream.columns().has('updatedAt'))
         dream.updatedAt = now;
-    const sqlifiedAttributes = (0, sqlAttributes_js_1.default)(dream);
-    if (alreadyPersisted) {
-        query = db
-            .updateTable(dream.table)
-            .set(sqlifiedAttributes)
-            .where((0, namespaceColumn_js_1.default)(dream.primaryKey, dream.table), '=', dream.primaryKeyValue);
-    }
-    else {
-        query = db.insertInto(dream.table).values(sqlifiedAttributes);
-    }
+    const hasUnsavedData = !!Object.keys((0, sqlAttributes_js_1.default)(dream)).length;
     // BeforeSave/Update actions may clear all the data that we intended to save, leaving us with
     // an invalid update command. The Sortable decorator is an example of this.
-    if (!alreadyPersisted || Object.keys(sqlifiedAttributes).length) {
-        const data = await (0, executeDatabaseQuery_js_1.default)(query.returning([...dream.columns()]), 'executeTakeFirstOrThrow');
+    if (!alreadyPersisted || hasUnsavedData) {
+        const data = await Query_js_1.default.dbDriverClass().saveDream(dream, txn);
         dream['isPersisted'] = true;
         dream.setAttributes(data);
     }

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

@@ -1,79 +1,22 @@
 import DreamCLI from '../cli/index.js';
-import DreamApp from '../dream-app/index.js';
-import EnvInternal from '../helpers/EnvInternal.js';
-import SchemaBuilder from '../helpers/cli/SchemaBuilder.js';
+import Query from '../dream/Query.js';
 import generateDream from '../helpers/cli/generateDream.js';
-import generateMigration from '../helpers/cli/generateMigration.js';
-import createDb from '../helpers/db/createDb.js';
-import _dropDb from '../helpers/db/dropDb.js';
-import loadPgClient from '../helpers/db/loadPgClient.js';
-import runMigration from '../helpers/db/runMigration.js';
 import sspawn from '../helpers/sspawn.js';
-import writeSyncFile from './helpers/sync.js';
 export default class DreamBin {
     static async sync(onSync) {
-        DreamCLI.logger.logStartProgress('writing db schema...');
-        await writeSyncFile();
-        DreamCLI.logger.logEndProgress();
-        DreamCLI.logger.logStartProgress('building dream schema...');
-        await this.buildDreamSchema();
-        DreamCLI.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().build();
+        await Query.dbDriverClass().sync(onSync);
     }
     static async dbCreate() {
-        const dreamApp = DreamApp.getOrFail();
-        const primaryDbConf = dreamApp.dbConnectionConfig('primary');
-        DreamCLI.logger.logStartProgress(`creating ${primaryDbConf.name}...`);
-        await createDb('primary');
-        DreamCLI.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.dbDriverClass().dbCreate();
     }
     static async dbDrop() {
-        const dreamApp = DreamApp.getOrFail();
-        const primaryDbConf = dreamApp.dbConnectionConfig('primary');
-        DreamCLI.logger.logStartProgress(`dropping ${primaryDbConf.name}...`);
-        await _dropDb('primary');
-        DreamCLI.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.dbDriverClass().dbDrop();
     }
     static async dbMigrate() {
-        const dreamApp = DreamApp.getOrFail();
-        const primaryDbConf = dreamApp.dbConnectionConfig('primary');
-        DreamCLI.logger.logStartProgress(`migrating ${primaryDbConf.name}...`);
-        await runMigration({ mode: 'migrate' });
-        DreamCLI.logger.logEndProgress();
-        await this.duplicateDatabase();
+        await Query.dbDriverClass().migrate();
     }
     static async dbRollback(opts) {
-        const dreamApp = DreamApp.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;
-        }
-        DreamCLI.logger.logEndProgress();
-        await this.duplicateDatabase();
+        await Query.dbDriverClass().rollback(opts);
     }
     static async generateDream(fullyQualifiedModelName, columnsWithTypes, options) {
         await generateDream({ fullyQualifiedModelName, columnsWithTypes, options });
@@ -87,7 +30,7 @@ export default class DreamBin {
         });
     }
     static async generateMigration(migrationName, columnsWithTypes) {
-        await generateMigration({ migrationName, columnsWithTypes });
+        await Query.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
@@ -97,27 +40,4 @@ export default class DreamBin {
         await sspawn('yarn typedoc src/index.ts --tsconfig ./tsconfig.esm.build.json --out docs');
         DreamCLI.logger.logEndProgress();
     }
-    static async duplicateDatabase() {
-        const dreamApp = DreamApp.getOrFail();
-        const parallelTests = dreamApp.parallelTests;
-        if (!parallelTests)
-            return;
-        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}...`, { 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}`;
-            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/dream/LeftJoinLoadBuilder.js

@@ -65,7 +65,7 @@ export default class LeftJoinLoadBuilder {
             const associationMetadata = this.dream['getAssociationMetadata'](associationName);
             if (associationMetadata === undefined)
                 throw new UnexpectedUndefined();
-            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/esm/src/dream/LoadBuilder.js

@@ -59,7 +59,7 @@ export default 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;
     }
 }