@rvoh/dream 1.4.2 → 1.5.1

package/dist/cjs/src/helpers/cli/generateFactoryContent.js

@@ -47,27 +47,56 @@ function generateFactoryContent({ fullyQualifiedModelName, columnsWithTypes, })
                 attributeDefaults.push(`${attributeVariable}: \`${fullyQualifiedModelName} ${attributeVariable} ${counterVariableIncremented ? '${counter}' : '${++counter}'}\`,`);
                 counterVariableIncremented = true;
                 break;
+            case 'string[]':
+            case 'text[]':
+            case 'citext[]':
+                attributeDefaults.push(`${attributeVariable}: [\`${fullyQualifiedModelName} ${attributeVariable} ${counterVariableIncremented ? '${counter}' : '${++counter}'}\`],`);
+                counterVariableIncremented = true;
+                break;
             case 'enum':
                 attributeDefaults.push(`${attributeVariable}: '${(descriptors.at(-1) || '<tbd>').split(',')[0]}',`);
                 break;
+            case 'enum[]':
+                attributeDefaults.push(`${attributeVariable}: ['${(descriptors.at(-1) || '<tbd>').split(',')[0]}'],`);
+                break;
             case 'integer':
                 attributeDefaults.push(`${attributeVariable}: 1,`);
                 break;
+            case 'integer[]':
+                attributeDefaults.push(`${attributeVariable}: [1],`);
+                break;
             case 'bigint':
                 attributeDefaults.push(`${attributeVariable}: '11111111111111111',`);
                 break;
+            case 'bigint[]':
+                attributeDefaults.push(`${attributeVariable}: ['11111111111111111'],`);
+                break;
             case 'decimal':
                 attributeDefaults.push(`${attributeVariable}: 1.1,`);
                 break;
+            case 'decimal[]':
+                attributeDefaults.push(`${attributeVariable}: [1.1],`);
+                break;
             case 'date':
                 dreamImports.push('CalendarDate');
                 attributeDefaults.push(`${attributeVariable}: CalendarDate.today(),`);
                 break;
+            case 'date[]':
+                dreamImports.push('CalendarDate');
+                attributeDefaults.push(`${attributeVariable}: [CalendarDate.today()],`);
+                break;
             case 'datetime':
                 dreamImports.push('DateTime');
                 attributeDefaults.push(`${attributeVariable}: DateTime.now(),`);
                 break;
+            case 'datetime[]':
+                dreamImports.push('DateTime');
+                attributeDefaults.push(`${attributeVariable}: [DateTime.now()],`);
+                break;
             default:
+                if (/\[\]$/.test(attributeType)) {
+                    attributeDefaults.push(`${attributeVariable}: [],`);
+                }
             // noop
         }
     }

package/dist/cjs/src/helpers/cli/generateMigration.js

@@ -13,15 +13,17 @@ const dreamFileAndDirPaths_js_1 = require("../path/dreamFileAndDirPaths.js");
 const dreamPath_js_1 = require("../path/dreamPath.js");
 const snakeify_js_1 = require("../snakeify.js");
 const generateStiMigrationContent_js_1 = require("./generateStiMigrationContent.js");
-async function generateMigration({ migrationName, columnsWithTypes, fullyQualifiedModelName, fullyQualifiedParentName, }) {
-    const { relFilePath, absFilePath } = (0, dreamFileAndDirPaths_js_1.default)(path.join((0, dreamPath_js_1.default)('db'), 'migrations'), `${(0, migrationVersion_js_1.default)()}-${(0, hyphenize_js_1.default)(migrationName).replace(/\//g, '-')}.ts`);
+async function generateMigration({ migrationName, columnsWithTypes, connectionName, fullyQualifiedModelName, fullyQualifiedParentName, }) {
+    const { relFilePath, absFilePath } = connectionName === 'default'
+        ? (0, dreamFileAndDirPaths_js_1.default)(path.join((0, dreamPath_js_1.default)('db'), 'migrations'), `${(0, migrationVersion_js_1.default)()}-${(0, hyphenize_js_1.default)(migrationName).replace(/\//g, '-')}.ts`)
+        : (0, dreamFileAndDirPaths_js_1.default)(path.join((0, dreamPath_js_1.default)('db'), 'migrations', connectionName), `${(0, migrationVersion_js_1.default)()}-${(0, hyphenize_js_1.default)(migrationName).replace(/\//g, '-')}.ts`);
     const isSTI = !!fullyQualifiedParentName;
     let finalContent = '';
     if (isSTI) {
         finalContent = (0, generateStiMigrationContent_js_1.default)({
             table: (0, snakeify_js_1.default)((0, pluralize_esm_1.default)((0, pascalizePath_js_1.default)(fullyQualifiedParentName))),
             columnsWithTypes,
-            primaryKeyType: (0, primaryKeyType_js_1.default)(),
+            primaryKeyType: (0, primaryKeyType_js_1.default)(connectionName),
             stiChildClassName: (0, pascalizePath_js_1.default)(fullyQualifiedModelName),
         });
     }
@@ -29,7 +31,7 @@ async function generateMigration({ migrationName, columnsWithTypes, fullyQualifi
         finalContent = (0, generateMigrationContent_js_1.default)({
             table: (0, snakeify_js_1.default)((0, pluralize_esm_1.default)((0, pascalizePath_js_1.default)(fullyQualifiedModelName))),
             columnsWithTypes,
-            primaryKeyType: (0, primaryKeyType_js_1.default)(),
+            primaryKeyType: (0, primaryKeyType_js_1.default)(connectionName),
         });
     }
     else {
@@ -37,7 +39,7 @@ async function generateMigration({ migrationName, columnsWithTypes, fullyQualifi
         finalContent = (0, generateMigrationContent_js_1.default)({
             table: tableName ? (0, pluralize_esm_1.default)((0, snakeify_js_1.default)(tableName)) : '<table-name>',
             columnsWithTypes,
-            primaryKeyType: (0, primaryKeyType_js_1.default)(),
+            primaryKeyType: (0, primaryKeyType_js_1.default)(connectionName),
             createOrAlter: 'alter',
         });
     }

package/dist/cjs/src/helpers/cli/generateMigrationContent.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = generateMigrationContent;
 exports.optionalFromDescriptors = optionalFromDescriptors;
 const pluralize_esm_1 = require("pluralize-esm");
+const Query_js_1 = require("../../dream/Query.js");
 const InvalidDecimalFieldPassedToGenerator_js_1 = require("../../errors/InvalidDecimalFieldPassedToGenerator.js");
 const compact_js_1 = require("../compact.js");
-const foreignKeyTypeFromPrimaryKey_js_1 = require("../db/foreignKeyTypeFromPrimaryKey.js");
 const snakeify_js_1 = require("../snakeify.js");
 const STI_TYPE_COLUMN_NAME = 'type';
 const COLUMNS_TO_INDEX = [STI_TYPE_COLUMN_NAME];
-function generateMigrationContent({ table, columnsWithTypes = [], primaryKeyType = 'bigserial', createOrAlter = 'create', stiChildClassName, } = {}) {
+function generateMigrationContent({ connectionName = 'default', table, columnsWithTypes = [], primaryKeyType = 'bigserial', createOrAlter = 'create', stiChildClassName, } = {}) {
     const altering = createOrAlter === 'alter';
     let requireCitextExtension = false;
     const checkConstraints = [];
@@ -41,7 +41,7 @@ function generateMigrationContent({ table, columnsWithTypes = [], primaryKeyType
         }
         switch (attributeType) {
             case 'belongs_to':
-                columnDefs.push(generateBelongsToStr(attributeName, {
+                columnDefs.push(generateBelongsToStr(connectionName, attributeName, {
                     primaryKeyType,
                     optional,
                 }));
@@ -50,15 +50,27 @@ function generateMigrationContent({ table, columnsWithTypes = [], primaryKeyType
             case 'enum':
                 columnDefs.push(generateEnumStr(attributeName, { descriptors, optional }));
                 break;
+            case 'enum[]':
+                columnDefs.push(generateEnumStr(attributeName, { descriptors, optional, asArray: true }));
+                break;
             case 'decimal':
                 columnDefs.push(generateDecimalStr(attributeName, { descriptors, optional }));
                 break;
+            case 'decimal[]':
+                columnDefs.push(generateDecimalStr(attributeName, { descriptors, optional, asArray: true }));
+                break;
+            // array case for booleans can be handled with the default block.
+            // the only thing that is customized for a boolean field is the default
+            // value, which doesn't need to be special for boolean[]
             case 'boolean':
                 columnDefs.push(generateBooleanStr(attributeName, { optional }));
                 break;
             case 'encrypted':
                 columnDefs.push(generateColumnStr(`encrypted_${attributeName}`, 'text', descriptors, { optional }));
                 break;
+            // TODO: determine if we need to support encrypted[] in the future
+            case 'encrypted[]':
+                throw new Error('the "encrypted[]" column type is not supported');
             default:
                 if (sqlAttributeType !== undefined) {
                     columnDefs.push(generateColumnStr(attributeName, sqlAttributeType, descriptors, { optional }));
@@ -130,19 +142,25 @@ function getAttributeType(attributeType, descriptors) {
     switch (attributeType) {
         case 'string':
             return `varchar(${descriptors[0] || 255})`;
+        case 'string[]':
+            return `varchar(${descriptors[0] || 255})[]`;
         case 'enum':
             return enumAttributeType(descriptors);
+        case 'enum[]':
+            return enumAttributeType(descriptors, true);
         case 'datetime':
             return 'timestamp';
         default:
             return attributeType;
     }
 }
-function enumAttributeType(descriptors) {
-    return `sql\`${descriptors[0]}_enum\``;
+function enumAttributeType(descriptors, asArray = false) {
+    const suffix = asArray ? '[]' : '';
+    return `sql\`${descriptors[0]}_enum${suffix}\``;
 }
+const ENUM_OR_ENUM_ARRAY_REGEX = /:enum:.*:|:enum\[\]:.*:/;
 function generateEnumStatements(columnsWithTypes) {
-    const enumStatements = columnsWithTypes.filter(attribute => /:enum:.*:/.test(attribute));
+    const enumStatements = columnsWithTypes.filter(attribute => ENUM_OR_ENUM_ARRAY_REGEX.test(attribute));
     const finalStatements = (0, compact_js_1.default)(enumStatements.map(statement => {
         const [, , enumName, ...descriptors] = statement.split(':');
         optionalFromDescriptors(descriptors);
@@ -160,7 +178,7 @@ function generateEnumStatements(columnsWithTypes) {
     return finalStatements.length ? finalStatements.join('\n\n') + '\n\n' : '';
 }
 function generateEnumDropStatements(columnsWithTypes) {
-    const enumStatements = columnsWithTypes.filter(attribute => /:enum:.*:/.test(attribute));
+    const enumStatements = columnsWithTypes.filter(attribute => ENUM_OR_ENUM_ARRAY_REGEX.test(attribute));
     const finalStatements = (0, compact_js_1.default)(enumStatements.map(statement => {
         const [, , enumName, ...descriptors] = statement.split(':');
         optionalFromDescriptors(descriptors);
@@ -174,17 +192,22 @@ function generateEnumDropStatements(columnsWithTypes) {
 function generateBooleanStr(attributeName, { optional }) {
     return `.addColumn('${attributeName}', 'boolean'${optional ? '' : ', col => col.notNull().defaultTo(false)'})`;
 }
-function generateEnumStr(attributeName, { descriptors, optional }) {
-    const computedAttributeType = enumAttributeType(descriptors);
+function generateEnumStr(attributeName, { descriptors, optional, asArray = false }) {
+    const computedAttributeType = enumAttributeType(descriptors, asArray);
     if (attributeName === undefined)
         return '';
-    return `.addColumn('${attributeName}', ${computedAttributeType}${optional ? '' : ', col => col.notNull()'})`;
+    const columnModifiers = asArray ? "col.notNull().defaultTo('{}')" : 'col.notNull()';
+    return `.addColumn('${attributeName}', ${computedAttributeType}${optional ? '' : `, col => ${columnModifiers}`})`;
 }
-function generateDecimalStr(attributeName, { descriptors, optional }) {
+function generateDecimalStr(attributeName, { descriptors, optional, asArray = false }) {
     const [scale, precision] = descriptors[0]?.split(',') || [null, null];
     if (!scale || !precision)
         throw new InvalidDecimalFieldPassedToGenerator_js_1.default(attributeName);
-    return `.addColumn('${attributeName}', 'decimal(${scale}, ${precision})'${optional ? '' : ', col => col.notNull()'})`;
+    const columnModifiers = asArray ? "col.notNull().defaultTo('{}')" : 'col.notNull()';
+    const decimalStatement = asArray
+        ? `sql\`decimal(${scale}, ${precision})[]\``
+        : `'decimal(${scale}, ${precision})'`;
+    return `.addColumn('${attributeName}', ${decimalStatement}${optional ? '' : `, col => ${columnModifiers}`})`;
 }
 function generateColumnStr(attributeName, attributeType, descriptors, { optional }) {
     let returnStr = `.addColumn('${attributeName}', ${attributeTypeString(attributeType)}`;
@@ -192,12 +215,15 @@ function generateColumnStr(attributeName, attributeType, descriptors, { optional
     const providedDefault = providedDefaultArg?.replace(/^default\(/, '')?.replace(/\)$/, '');
     const notNull = !optional;
     const hasExtraValues = providedDefault || notNull;
+    const isArray = /\[\]$/.test(attributeType);
     if (hasExtraValues)
         returnStr += ', col => col';
     if (notNull)
         returnStr += '.notNull()';
     if (providedDefault)
         returnStr += `.defaultTo('${providedDefault}')`;
+    else if (isArray)
+        returnStr += `.defaultTo('{}')`;
     returnStr = `${returnStr})`;
     if (attributeName === STI_TYPE_COLUMN_NAME)
         returnStr = `// CONSIDER: when using type for STI, always use an enum
@@ -210,6 +236,7 @@ function attributeTypeString(attributeType) {
     const attributeTypesRequiringSql = ['citext'];
     if (attributeTypesRequiringSql.includes(attributeType))
         return `sql\`${attributeType}\``;
+    const isArray = /\[\]$/.test(attributeType);
     switch (attributeType) {
         case 'varbit':
         case 'bitvarying':
@@ -217,11 +244,17 @@ function attributeTypeString(attributeType) {
         case 'txid_snapshot':
             return "'txid_snapshot'";
         default:
-            return `'${attributeType.replace(/_/g, ' ')}'`;
+            if (isArray) {
+                return `sql\`${attributeType.replace(/_/g, ' ')}\``;
+            }
+            else {
+                return `'${attributeType.replace(/_/g, ' ')}'`;
+            }
     }
 }
-function generateBelongsToStr(associationName, { primaryKeyType, optional = false, }) {
-    const dataType = (0, foreignKeyTypeFromPrimaryKey_js_1.default)(primaryKeyType);
+function generateBelongsToStr(connectionName, associationName, { primaryKeyType, optional = false, }) {
+    const dbDriverClass = Query_js_1.default.dbDriverClass(connectionName);
+    const dataType = dbDriverClass.foreignKeyTypeFromPrimaryKey(primaryKeyType);
     const references = (0, pluralize_esm_1.default)(associationName.replace(/\//g, '_').replace(/_id$/, ''));
     return `.addColumn('${associationNameToForeignKey(associationName)}', '${dataType}', col => col.references('${references}.id').onDelete('restrict')${optional ? '' : '.notNull()'})`;
 }

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

@@ -1,26 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = primaryKeyType;
-const index_js_1 = require("../../dream-app/index.js");
-const constants_js_1 = require("../../dream/constants.js");
-function primaryKeyType() {
-    const dreamconf = index_js_1.default.getOrFail();
-    switch (dreamconf.primaryKeyType) {
-        case 'bigint':
-        case 'bigserial':
-        case 'uuid':
-        case 'integer':
-            return dreamconf.primaryKeyType;
-        default: {
-            // protection so that if a new EncryptAlgorithm is ever added, this will throw a type error at build time
-            const _never = dreamconf.primaryKeyType;
-            throw new Error(`
-ATTENTION!
-
-  unrecognized primary key type "${_never}" found in .dream.yml.
-  please use one of the allowed primary key types:
-    ${constants_js_1.primaryKeyTypes.join(', ')}
-      `);
-        }
-    }
+const Query_js_1 = require("../../dream/Query.js");
+function primaryKeyType(connectionName) {
+    const dbDriverClass = Query_js_1.default.dbDriverClass(connectionName);
+    return dbDriverClass.primaryKeyType();
 }

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = sqlAttributes;
+const index_js_1 = require("../dream-app/index.js");
 const CalendarDate_js_1 = require("./CalendarDate.js");
 const DateTime_js_1 = require("./DateTime.js");
 const isDatetimeOrDatetimeArrayColumn_js_1 = require("./db/types/isDatetimeOrDatetimeArrayColumn.js");
@@ -9,6 +10,7 @@ const normalizeUnicode_js_1 = require("./normalizeUnicode.js");
 function sqlAttributes(dream) {
     const attributes = dream.dirtyAttributes();
     const dreamClass = dream.constructor;
+    const queryDriverClass = index_js_1.default.getOrFail().dbConnectionQueryDriverClass(dream.connectionName);
     return Object.keys(attributes).reduce((result, key) => {
         let val = attributes[key];
         if (val === undefined)
@@ -26,13 +28,14 @@ function sqlAttributes(dream) {
                 val = (0, normalizeUnicode_js_1.default)(val);
         }
         if (val instanceof DateTime_js_1.DateTime || val instanceof CalendarDate_js_1.default) {
+            const dateOrDatetime = val instanceof DateTime_js_1.DateTime ? 'datetime' : 'date';
             // Converting toJSDate resulted in the correct timezone, but even with process.env.TZ=UTC,
             // Kysely inserted into the database with the machine timezone, which can shift the date
             // (e.g., toJSDate resulted in a JS Date that formats as "1987-04-07T00:00:00.000Z", but
             // Kysely inserted "1907-04-06"  into the database). By converting to an SQL string before
             // handing off to Kysely, we bypass Javascript dates altogether, sending the string into the
             // database for storage as a date or datetime.
-            result[key] = val.toSQL();
+            result[key] = queryDriverClass.serializeDbType(dateOrDatetime, val);
         }
         else {
             result[key] = val;

package/dist/cjs/src/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeUnicode = exports.loadRepl = exports.isEmpty = exports.intersection = exports.hyphenize = exports.groupBy = exports.globalClassNameFromFullyQualifiedModelName = exports.Env = exports.DreamLogos = exports.DateTime = exports.compact = exports.cloneDeepSafe = exports.generateDream = exports.capitalize = exports.camelize = exports.CalendarDate = exports.Benchmark = exports.ValidationError = exports.RecordNotFound = exports.GlobalNameNotSet = exports.NotNullViolation = exports.DataTypeColumnTypeMismatch = exports.CheckConstraintViolation = exports.CreateOrFindByFailedToCreateAndFind = exports.NonLoadedAssociation = exports.Encrypt = exports.Query = exports.DreamTransaction = exports.openapiShorthandPrimitiveTypes = exports.openapiPrimitiveTypes = exports.DreamConst = exports.Dream = exports.DreamAppAllowedPackageManagersEnumValues = exports.DreamApp = exports.lookupClassByGlobalName = exports.DreamImporter = exports.Decorators = exports.STI = exports.SoftDelete = exports.ReplicaSafe = exports.validateTable = exports.validateColumn = exports.DreamMigrationHelpers = exports.untypedDb = exports.pgErrorType = exports.dreamDbConnections = exports.closeAllDbConnections = exports.DreamCLI = exports.CliFileWriter = exports.DreamBin = void 0;
-exports.ObjectSerializerBuilder = exports.DreamSerializerBuilder = exports.ObjectSerializer = exports.DreamSerializer = exports.serializerNameFromFullyQualifiedModelName = exports.isDreamSerializer = exports.inferSerializersFromDreamClassOrViewModelClass = exports.inferSerializerFromDreamOrViewModel = exports.ops = exports.uniq = exports.uncapitalize = exports.expandStiClasses = exports.standardizeFullyQualifiedModelName = exports.sortObjectByValue = exports.sortObjectByKey = exports.sortBy = exports.sort = exports.snakeify = exports.round = exports.range = exports.Range = exports.sharedPathPrefix = exports.relativeDreamPath = exports.dreamPath = exports.pascalize = void 0;
+exports.intersection = exports.hyphenize = exports.groupBy = exports.globalClassNameFromFullyQualifiedModelName = exports.Env = exports.DreamLogos = exports.DateTime = exports.compact = exports.cloneDeepSafe = exports.generateDream = exports.capitalize = exports.camelize = exports.CalendarDate = exports.Benchmark = exports.ValidationError = exports.RecordNotFound = exports.GlobalNameNotSet = exports.NotNullViolation = exports.DataTypeColumnTypeMismatch = exports.CheckConstraintViolation = exports.CreateOrFindByFailedToCreateAndFind = exports.NonLoadedAssociation = exports.Encrypt = exports.PostgresQueryDriver = exports.KyselyQueryDriver = exports.QueryDriverBase = exports.Query = exports.DreamTransaction = exports.openapiShorthandPrimitiveTypes = exports.openapiPrimitiveTypes = exports.DreamConst = exports.Dream = exports.DreamAppAllowedPackageManagersEnumValues = exports.DreamApp = exports.lookupClassByGlobalName = exports.DreamImporter = exports.Decorators = exports.STI = exports.SoftDelete = exports.ReplicaSafe = exports.validateTable = exports.validateColumn = exports.DreamMigrationHelpers = exports.untypedDb = exports.pgErrorType = exports.dreamDbConnections = exports.closeAllDbConnections = exports.DreamCLI = exports.CliFileWriter = exports.DreamBin = void 0;
+exports.ObjectSerializerBuilder = exports.DreamSerializerBuilder = exports.ObjectSerializer = exports.DreamSerializer = exports.serializerNameFromFullyQualifiedModelName = exports.isDreamSerializer = exports.inferSerializersFromDreamClassOrViewModelClass = exports.inferSerializerFromDreamOrViewModel = exports.ops = exports.uniq = exports.uncapitalize = exports.expandStiClasses = exports.standardizeFullyQualifiedModelName = exports.sortObjectByValue = exports.sortObjectByKey = exports.sortBy = exports.sort = exports.snakeify = exports.round = exports.range = exports.Range = exports.sharedPathPrefix = exports.relativeDreamPath = exports.dreamPath = exports.pascalize = exports.normalizeUnicode = exports.loadRepl = exports.isEmpty = void 0;
 var index_js_1 = require("./bin/index.js");
 Object.defineProperty(exports, "DreamBin", { enumerable: true, get: function () { return index_js_1.default; } });
 var CliFileWriter_js_1 = require("./cli/CliFileWriter.js");
@@ -46,6 +46,12 @@ var DreamTransaction_js_1 = require("./dream/DreamTransaction.js");
 Object.defineProperty(exports, "DreamTransaction", { enumerable: true, get: function () { return DreamTransaction_js_1.default; } });
 var Query_js_1 = require("./dream/Query.js");
 Object.defineProperty(exports, "Query", { enumerable: true, get: function () { return Query_js_1.default; } });
+var Base_js_1 = require("./dream/QueryDriver/Base.js");
+Object.defineProperty(exports, "QueryDriverBase", { enumerable: true, get: function () { return Base_js_1.default; } });
+var Kysely_js_1 = require("./dream/QueryDriver/Kysely.js");
+Object.defineProperty(exports, "KyselyQueryDriver", { enumerable: true, get: function () { return Kysely_js_1.default; } });
+var Postgres_js_1 = require("./dream/QueryDriver/Postgres.js");
+Object.defineProperty(exports, "PostgresQueryDriver", { enumerable: true, get: function () { return Postgres_js_1.default; } });
 var index_js_5 = require("./encrypt/index.js");
 Object.defineProperty(exports, "Encrypt", { enumerable: true, get: function () { return index_js_5.default; } });
 var NonLoadedAssociation_js_1 = require("./errors/associations/NonLoadedAssociation.js");

package/dist/esm/src/Dream.js

@@ -1,6 +1,5 @@
 import yoctocolors from 'yoctocolors';
 import { pgErrorType, UNIQUE_VIOLATION } from './db/errors.js';
-import db from './db/index.js';
 import associationToGetterSetterProp from './decorators/field/association/associationToGetterSetterProp.js';
 import { blankAssociationsFactory } from './decorators/field/association/shared.js';
 import { blankHooksFactory } from './decorators/field/lifecycle/shared.js';
@@ -8,7 +7,6 @@ import resortAllRecords from './decorators/field/sortable/helpers/resortAllRecor
 import DreamApp from './dream-app/index.js';
 import DreamClassTransactionBuilder from './dream/DreamClassTransactionBuilder.js';
 import DreamInstanceTransactionBuilder from './dream/DreamInstanceTransactionBuilder.js';
-import DreamTransaction from './dream/DreamTransaction.js';
 import associationQuery from './dream/internal/associations/associationQuery.js';
 import associationUpdateQuery from './dream/internal/associations/associationUpdateQuery.js';
 import createAssociation from './dream/internal/associations/createAssociation.js';
@@ -106,8 +104,14 @@ export default class Dream {
     get schema() {
         throw new DreamMissingRequiredOverride(this.constructor, 'schema');
     }
-    get globalSchema() {
-        throw new DreamMissingRequiredOverride(this.constructor, 'globalSchema');
+    get connectionName() {
+        return 'default';
+    }
+    get connectionTypeConfig() {
+        throw new DreamMissingRequiredOverride(this.constructor, 'connectionTypeConfig');
+    }
+    get globalTypeConfig() {
+        throw new DreamMissingRequiredOverride(this.constructor, 'globalTypeConfig');
     }
     /**
      * Determines if the provided Dream class is the same as or a subclass of this Dream class.
@@ -1731,16 +1735,8 @@ export default class Dream {
      * @returns void
      */
     static async transaction(callback) {
-        const dreamTransaction = new DreamTransaction();
-        let callbackResponse = undefined;
-        await db('primary')
-            .transaction()
-            .execute(async (kyselyTransaction) => {
-            dreamTransaction.kyselyTransaction = kyselyTransaction;
-            callbackResponse = (await callback(dreamTransaction));
-        });
-        await dreamTransaction.runAfterCommitHooks(dreamTransaction);
-        return callbackResponse;
+        const dbDriverClass = Query.dbDriverClass(this.prototype.connectionName);
+        return (await dbDriverClass.transaction(this.prototype, callback));
     }
     /**
      * Sends data through for use as passthrough data

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

@@ -1,22 +1,38 @@
 import DreamCLI from '../cli/index.js';
+import DreamApp from '../dream-app/index.js';
 import Query from '../dream/Query.js';
 import generateDream from '../helpers/cli/generateDream.js';
 import sspawn from '../helpers/sspawn.js';
 export default class DreamBin {
     static async sync(onSync, options) {
-        await Query.dbDriverClass().sync(onSync, options);
+        const dreamApp = DreamApp.getOrFail();
+        for (const connectionName of Object.keys(dreamApp.dbCredentials)) {
+            await Query.dbDriverClass(connectionName).sync(connectionName, onSync, options);
+        }
     }
     static async dbCreate() {
-        await Query.dbDriverClass().dbCreate();
+        const dreamApp = DreamApp.getOrFail();
+        for (const connectionName of Object.keys(dreamApp.dbCredentials)) {
+            await Query.dbDriverClass(connectionName).dbCreate(connectionName);
+        }
     }
     static async dbDrop() {
-        await Query.dbDriverClass().dbDrop();
+        const dreamApp = DreamApp.getOrFail();
+        for (const connectionName of Object.keys(dreamApp.dbCredentials)) {
+            await Query.dbDriverClass(connectionName).dbDrop(connectionName);
+        }
     }
     static async dbMigrate() {
-        await Query.dbDriverClass().migrate();
+        const dreamApp = DreamApp.getOrFail();
+        for (const connectionName of Object.keys(dreamApp.dbCredentials)) {
+            await Query.dbDriverClass(connectionName).migrate(connectionName);
+        }
     }
     static async dbRollback(opts) {
-        await Query.dbDriverClass().rollback(opts);
+        const dreamApp = DreamApp.getOrFail();
+        for (const connectionName of Object.keys(dreamApp.dbCredentials)) {
+            await Query.dbDriverClass(connectionName).rollback({ ...opts, connectionName });
+        }
     }
     static async generateDream(fullyQualifiedModelName, columnsWithTypes, options) {
         await generateDream({
@@ -33,8 +49,8 @@ export default class DreamBin {
             fullyQualifiedParentName,
         });
     }
-    static async generateMigration(migrationName, columnsWithTypes) {
-        await Query.dbDriverClass().generateMigration(migrationName, columnsWithTypes);
+    static async generateMigration(migrationName, columnsWithTypes, connectionName) {
+        await Query.dbDriverClass(connectionName).generateMigration(connectionName, 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

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

@@ -13,25 +13,37 @@ ${INDENT}    subtitle:string:optional
 ${INDENT}
 ${INDENT}supported types:
 ${INDENT}    - citext:
+${INDENT}    - citext[]:
 ${INDENT}        case insensitive text (indexes and queries are automatically case insensitive)
 ${INDENT}
 ${INDENT}    - string:
+${INDENT}    - string[]:
 ${INDENT}        varchar; allowed length defaults to 255, but may be customized, e.g.: subtitle:string:128 or subtitle:string:128:optional
 ${INDENT}
 ${INDENT}    - text
+${INDENT}    - text[]
 ${INDENT}    - date
+${INDENT}    - date[]
 ${INDENT}    - datetime
+${INDENT}    - datetime[]
 ${INDENT}    - integer
+${INDENT}    - integer[]
 ${INDENT}
 ${INDENT}    - decimal:
+${INDENT}    - decimal[]:
 ${INDENT}        scale,precision is required, e.g.: volume:decimal:3,2 or volume:decimal:3,2:optional
+${INDENT}        
+${INDENT}        leveraging arrays, add the "[]" suffix, e.g.: volume:decimal[]:3,2
 ${INDENT}
 ${INDENT}    - enum:
+${INDENT}    - enum[]:
 ${INDENT}        include the enum name to automatically create the enum:
 ${INDENT}          type:enum:room_types:bathroom,kitchen,bedroom or type:enum:room_types:bathroom,kitchen,bedroom:optional
 ${INDENT}
 ${INDENT}        omit the enum values to leverage an existing enum (omits the enum type creation):
-${INDENT}          type:enum:room_types or type:enum:room_types:optional`;
+${INDENT}          type:enum:room_types or type:enum:room_types:optional
+${INDENT}
+${INDENT}        leveraging arrays, add the "[]" suffix, e.g.: type:enum[]:room_types:bathroom,kitchen,bedroom`;
 const columnsWithTypesDescription = baseColumnsWithTypesDescription +
     `
 ${INDENT}
@@ -78,10 +90,11 @@ export default class DreamCLI {
             .alias('g:migration')
             .description('create a new migration')
             .argument('<migrationName>', 'end with -to-table-name to prepopulate with an alterTable command')
+            .option('--connection-name <connectionName>', 'the connection name you wish to use for your migration')
             .argument('[columnsWithTypes...]', columnsWithTypesDescriptionForMigration)
-            .action(async (migrationName, columnsWithTypes) => {
+            .action(async (migrationName, columnsWithTypes, options) => {
             await initializeDreamApp();
-            await DreamBin.generateMigration(migrationName, columnsWithTypes);
+            await DreamBin.generateMigration(migrationName, columnsWithTypes, options.connectionName || 'default');
             process.exit();
         });
         program
@@ -90,6 +103,7 @@ export default class DreamCLI {
             .alias('generate:dream')
             .alias('g:dream')
             .option('--no-serializer')
+            .option('--connection-name <connectionName>', 'the db connection you want this attached to (defaults to the default db connection)', 'default')
             .option('--sti-base-serializer')
             .description('create a new Dream model')
             .argument('<modelName>', 'the name of the model to create, e.g. Post or Settings/CommunicationPreferences')
@@ -104,6 +118,7 @@ export default class DreamCLI {
             .alias('g:sti-child')
             .description('create a new Dream model that extends another Dream model, leveraging STI (single table inheritance)')
             .option('--no-serializer')
+            .option('--connection-name', 'the db connection you want this model attached to (defaults to the default connection)', 'default')
             .argument('<childModelName>', 'the name of the model to create, e.g. Post or Settings/CommunicationPreferences')
             .argument('<extends>', 'just the word "extends"')
             .argument('<parentModelName>', `fully qualified name of the parent model, e.g.:

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

@@ -1,4 +1,3 @@
-import _db from '../db/index.js';
 export default class ConnectedToDB {
     dreamInstance;
     dreamClass;
@@ -27,13 +26,6 @@ export default class ConnectedToDB {
                 return 'primary';
         }
     }
-    // ATTENTION FRED
-    // stop trying to make this async. You never learn...
-    dbFor(sqlCommandType) {
-        if (this.dreamTransaction?.kyselyTransaction)
-            return this.dreamTransaction?.kyselyTransaction;
-        return _db(this.dbConnectionType(sqlCommandType));
-    }
     isReplicaSafe() {
         return this.innerJoinDreamClasses.reduce((accumulator, dreamClass) => accumulator && dreamClass['replicaSafe'], this.dreamClass['replicaSafe']);
     }

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

@@ -6,19 +6,19 @@
 // when being imported from our esm build.
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-import pg from 'pg';
-import { CamelCasePlugin, Kysely, PostgresDialect } from 'kysely';
+import { CamelCasePlugin, Kysely } from 'kysely';
 import DreamApp from '../dream-app/index.js';
+import protectAgainstPollutingAssignment from '../helpers/protectAgainstPollutingAssignment.js';
 let connections = {};
 export default class DreamDbConnection {
-    static getConnection(connectionType) {
+    static getConnection(connectionName, connectionType, dialectProvider) {
         const dreamApp = DreamApp.getOrFail();
-        const connectionName = this.getConnectionTypeName(connectionType);
-        const connection = connections[connectionName];
+        const connectionTypeName = this.getConnectionTypeName(connectionType);
+        const connection = connections[connectionName]?.[connectionTypeName];
         if (connection) {
             return connection;
         }
-        const connectionConf = dreamApp.dbConnectionConfig(connectionType);
+        const connectionConf = dreamApp.dbConnectionConfig(connectionName, connectionType);
         const dbConn = new Kysely({
             log(event) {
                 const dreamApp = DreamApp.getOrFail();
@@ -26,47 +26,35 @@ export default class DreamDbConnection {
                     fn(event);
                 });
             },
-            dialect: new PostgresDialect({
-                pool: new pg.Pool({
-                    user: connectionConf.user || '',
-                    password: connectionConf.password || '',
-                    database: dreamApp.dbName(connectionType),
-                    host: connectionConf.host || 'localhost',
-                    port: connectionConf.port || 5432,
-                    ssl: connectionConf.useSsl ? sslConfig(connectionConf) : false,
-                }),
-            }),
+            dialect: dialectProvider(connectionConf),
             plugins: [new CamelCasePlugin({ underscoreBetweenUppercaseLetters: true })],
         });
-        connections[this.getConnectionTypeName(connectionType)] = dbConn;
+        const protectedName = protectAgainstPollutingAssignment(connectionName);
+        connections[protectedName] ||= {};
+        connections[protectedName][this.getConnectionTypeName(connectionType)] = dbConn;
         return dbConn;
     }
-    static async dropAllConnections() {
-        for (const key of Object.keys(connections)) {
-            await connections[key]?.destroy();
-            delete connections[key];
-        }
-    }
     static getConnectionTypeName(connectionType) {
         return DreamApp.getOrFail().parallelDatabasesEnabled
             ? `${connectionType}_${process.env.VITEST_POOL_ID}`
             : connectionType;
     }
 }
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function sslConfig(connectionConf) {
-    // TODO: properly configure (https://rvohealth.atlassian.net/browse/PDTC-2914)
-    return {
-        rejectUnauthorized: false,
-        // ca: fs.readFileSync('/path/to/server-certificates/root.crt').toString(),
-        // key: fs.readFileSync('/path/to/client-key/postgresql.key').toString(),
-        // cert: fs.readFileSync('/path/to/client-certificates/postgresql.crt').toString(),
-    };
-}
 export function dreamDbConnections() {
     return connections;
 }
 export async function closeAllDbConnections() {
-    await Promise.all(Object.values(connections).map(conn => conn.destroy()));
+    const connectionNames = Object.keys(connections);
+    for (const connectionName of connectionNames) {
+        await closeAllConnectionsForConnectionName(connectionName);
+    }
     connections = {};
 }
+export async function closeAllConnectionsForConnectionName(connectionName) {
+    const protectedName = protectAgainstPollutingAssignment(connectionName);
+    return await Promise.allSettled(Object.keys(connections[protectedName]).map(async (key) => {
+        const conn = connections[protectedName][key];
+        await conn.destroy();
+        delete connections[protectedName][key];
+    }));
+}

package/dist/esm/src/db/helpers/dbTypesFilenameForConnection.js

@@ -0,0 +1,3 @@
+export default function dbTypesFilenameForConnection(connectionName) {
+    return connectionName === 'default' ? 'db.ts' : `db.${connectionName}.ts`;
+}