@rvoh/dream 2.26.0 → 2.27.0

package/dist/cjs/src/Dream.js

@@ -1787,23 +1787,6 @@ export default class Dream {
     static async pluck(...columnNames) {
         return (await this.query().pluck(...columnNames));
     }
-    /**
-     * Plucks the specified fields from the given dream class table
-     * in batches, passing each found columns into the
-     * provided callback function
-     *
-     * ```ts
-     * await User.order('id').pluckEach('id', (id) => {
-     *   console.log(id)
-     * })
-     * // 1
-     * // 2
-     * // 3
-     * ```
-     *
-     * @param args - a list of fields to pluck, followed by a callback function to call for each set of found fields
-     * @returns void
-     */
     static async pluckEach(...args) {
         return await this.query().pluckEach(...args);
     }

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

@@ -747,24 +747,6 @@ export default class DreamClassTransactionBuilder {
     async pluck(...columnNames) {
         return (await this.queryInstance().pluck(...columnNames));
     }
-    /**
-     * Plucks the specified fields from the given dream class table
-     * in batches, passing each found columns into the provided callback function.
-     *
-     * ```ts
-     * await ApplicationModel.transaction(async txn => {
-     *   await User.txn(txn).order('id').pluckEach('id', (id) => {
-     *     console.log(id)
-     *   })
-     *   // 1
-     *   // 2
-     *   // 3
-     * })
-     * ```
-     *
-     * @param fields - A list of fields to pluck, followed by a callback function to call for each set of found fields
-     * @returns void
-     */
     async pluckEach(...args) {
         await this.queryInstance().pluckEach(...args);
     }

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

@@ -1338,29 +1338,6 @@ export default class Query {
         const vals = await this.dbDriverInstance().pluck(...columnNames);
         return (columnNames.length > 1 ? vals : vals.flat());
     }
-    /**
-     * Plucks the specified column names from the given dream class table
-     * in batches, passing each found columns into the
-     * provided callback function
-     *
-     * ```ts
-     * await User.order('id').pluckEach('id', (id) => {
-     *   console.log(id)
-     * })
-     * // 1
-     * // 2
-     * // 3
-     * ```
-     *
-     * A `limit` or `offset` on the Query cannot compose with the batch windows
-     * — each window replaces the limit with the batch size and the offset with
-     * the running window offset, silently ignoring both — so a limit- or
-     * offset-carrying Query throws at runtime.
-     *
-     * @param args - a list of column names to pluck, followed by a callback function to call for each set of found fields
-     * @returns void
-     * @throws BatchingIncompatibleWithLimitOrOffset if the query carries a `limit` or `offset`
-     */
     async pluckEach(...args) {
         const providedCbIndex = args.findIndex(v => typeof v === 'function');
         const providedCb = args[providedCbIndex];

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

@@ -457,7 +457,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
             bypassSelectAll: true,
             bypassOrder: true,
         });
-        kyselyQuery = kyselyQuery.select(max(columnName));
+        kyselyQuery = kyselyQuery.select(max(this.namespaceColumn(columnName)));
         const data = await executeDatabaseQuery(kyselyQuery, 'executeTakeFirstOrThrow');
         return data.max;
     }
@@ -477,7 +477,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
     async maxBy(groupColumn, aggregatedColumn) {
         // eslint-disable-next-line @typescript-eslint/unbound-method
         const { max } = this.dbFor('select').fn;
-        return this.groupedAggregate(groupColumn, max(aggregatedColumn));
+        return this.groupedAggregate(groupColumn, max(this.namespaceColumn(aggregatedColumn)));
     }
     /**
      * Retrieves the min value of the specified column
@@ -498,7 +498,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
             bypassSelectAll: true,
             bypassOrder: true,
         });
-        kyselyQuery = kyselyQuery.select(min(columnName));
+        kyselyQuery = kyselyQuery.select(min(this.namespaceColumn(columnName)));
         const data = await executeDatabaseQuery(kyselyQuery, 'executeTakeFirstOrThrow');
         return data.min;
     }
@@ -518,7 +518,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
     async minBy(groupColumn, aggregatedColumn) {
         // eslint-disable-next-line @typescript-eslint/unbound-method
         const { min } = this.dbFor('select').fn;
-        return this.groupedAggregate(groupColumn, min(aggregatedColumn));
+        return this.groupedAggregate(groupColumn, min(this.namespaceColumn(aggregatedColumn)));
     }
     /**
      * Retrieves the sum value of the specified column
@@ -539,7 +539,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
             bypassSelectAll: true,
             bypassOrder: true,
         });
-        kyselyQuery = kyselyQuery.select(sum(columnName));
+        kyselyQuery = kyselyQuery.select(sum(this.namespaceColumn(columnName)));
         const data = await executeDatabaseQuery(kyselyQuery, 'executeTakeFirstOrThrow');
         return data.sum === null ? null : parseFloat(data.sum);
     }
@@ -559,7 +559,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
     async sumBy(groupColumn, aggregatedColumn) {
         // eslint-disable-next-line @typescript-eslint/unbound-method
         const { sum } = this.dbFor('select').fn;
-        return this.groupedAggregate(groupColumn, sum(aggregatedColumn), rawSum => rawSum === null ? null : parseFloat(rawSum));
+        return this.groupedAggregate(groupColumn, sum(this.namespaceColumn(aggregatedColumn)), rawSum => rawSum === null ? null : parseFloat(rawSum));
     }
     /**
      * Retrieves the average value of the specified column
@@ -580,7 +580,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
             bypassSelectAll: true,
             bypassOrder: true,
         });
-        kyselyQuery = kyselyQuery.select(avg(columnName));
+        kyselyQuery = kyselyQuery.select(avg(this.namespaceColumn(columnName)));
         const data = await executeDatabaseQuery(kyselyQuery, 'executeTakeFirstOrThrow');
         return data.avg;
     }
@@ -600,7 +600,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
     async avgBy(groupColumn, aggregatedColumn) {
         // eslint-disable-next-line @typescript-eslint/unbound-method
         const { avg } = this.dbFor('select').fn;
-        return this.groupedAggregate(groupColumn, avg(aggregatedColumn));
+        return this.groupedAggregate(groupColumn, avg(this.namespaceColumn(aggregatedColumn)));
     }
     /**
      * Retrieves the number of records in the database

package/dist/esm/src/Dream.js

@@ -1787,23 +1787,6 @@ export default class Dream {
     static async pluck(...columnNames) {
         return (await this.query().pluck(...columnNames));
     }
-    /**
-     * Plucks the specified fields from the given dream class table
-     * in batches, passing each found columns into the
-     * provided callback function
-     *
-     * ```ts
-     * await User.order('id').pluckEach('id', (id) => {
-     *   console.log(id)
-     * })
-     * // 1
-     * // 2
-     * // 3
-     * ```
-     *
-     * @param args - a list of fields to pluck, followed by a callback function to call for each set of found fields
-     * @returns void
-     */
     static async pluckEach(...args) {
         return await this.query().pluckEach(...args);
     }

package/dist/esm/src/dream/DreamClassTransactionBuilder.js

@@ -747,24 +747,6 @@ export default class DreamClassTransactionBuilder {
     async pluck(...columnNames) {
         return (await this.queryInstance().pluck(...columnNames));
     }
-    /**
-     * Plucks the specified fields from the given dream class table
-     * in batches, passing each found columns into the provided callback function.
-     *
-     * ```ts
-     * await ApplicationModel.transaction(async txn => {
-     *   await User.txn(txn).order('id').pluckEach('id', (id) => {
-     *     console.log(id)
-     *   })
-     *   // 1
-     *   // 2
-     *   // 3
-     * })
-     * ```
-     *
-     * @param fields - A list of fields to pluck, followed by a callback function to call for each set of found fields
-     * @returns void
-     */
     async pluckEach(...args) {
         await this.queryInstance().pluckEach(...args);
     }

package/dist/esm/src/dream/Query.js

@@ -1338,29 +1338,6 @@ export default class Query {
         const vals = await this.dbDriverInstance().pluck(...columnNames);
         return (columnNames.length > 1 ? vals : vals.flat());
     }
-    /**
-     * Plucks the specified column names from the given dream class table
-     * in batches, passing each found columns into the
-     * provided callback function
-     *
-     * ```ts
-     * await User.order('id').pluckEach('id', (id) => {
-     *   console.log(id)
-     * })
-     * // 1
-     * // 2
-     * // 3
-     * ```
-     *
-     * A `limit` or `offset` on the Query cannot compose with the batch windows
-     * — each window replaces the limit with the batch size and the offset with
-     * the running window offset, silently ignoring both — so a limit- or
-     * offset-carrying Query throws at runtime.
-     *
-     * @param args - a list of column names to pluck, followed by a callback function to call for each set of found fields
-     * @returns void
-     * @throws BatchingIncompatibleWithLimitOrOffset if the query carries a `limit` or `offset`
-     */
     async pluckEach(...args) {
         const providedCbIndex = args.findIndex(v => typeof v === 'function');
         const providedCb = args[providedCbIndex];

package/dist/esm/src/dream/QueryDriver/Kysely.js

@@ -457,7 +457,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
             bypassSelectAll: true,
             bypassOrder: true,
         });
-        kyselyQuery = kyselyQuery.select(max(columnName));
+        kyselyQuery = kyselyQuery.select(max(this.namespaceColumn(columnName)));
         const data = await executeDatabaseQuery(kyselyQuery, 'executeTakeFirstOrThrow');
         return data.max;
     }
@@ -477,7 +477,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
     async maxBy(groupColumn, aggregatedColumn) {
         // eslint-disable-next-line @typescript-eslint/unbound-method
         const { max } = this.dbFor('select').fn;
-        return this.groupedAggregate(groupColumn, max(aggregatedColumn));
+        return this.groupedAggregate(groupColumn, max(this.namespaceColumn(aggregatedColumn)));
     }
     /**
      * Retrieves the min value of the specified column
@@ -498,7 +498,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
             bypassSelectAll: true,
             bypassOrder: true,
         });
-        kyselyQuery = kyselyQuery.select(min(columnName));
+        kyselyQuery = kyselyQuery.select(min(this.namespaceColumn(columnName)));
         const data = await executeDatabaseQuery(kyselyQuery, 'executeTakeFirstOrThrow');
         return data.min;
     }
@@ -518,7 +518,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
     async minBy(groupColumn, aggregatedColumn) {
         // eslint-disable-next-line @typescript-eslint/unbound-method
         const { min } = this.dbFor('select').fn;
-        return this.groupedAggregate(groupColumn, min(aggregatedColumn));
+        return this.groupedAggregate(groupColumn, min(this.namespaceColumn(aggregatedColumn)));
     }
     /**
      * Retrieves the sum value of the specified column
@@ -539,7 +539,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
             bypassSelectAll: true,
             bypassOrder: true,
         });
-        kyselyQuery = kyselyQuery.select(sum(columnName));
+        kyselyQuery = kyselyQuery.select(sum(this.namespaceColumn(columnName)));
         const data = await executeDatabaseQuery(kyselyQuery, 'executeTakeFirstOrThrow');
         return data.sum === null ? null : parseFloat(data.sum);
     }
@@ -559,7 +559,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
     async sumBy(groupColumn, aggregatedColumn) {
         // eslint-disable-next-line @typescript-eslint/unbound-method
         const { sum } = this.dbFor('select').fn;
-        return this.groupedAggregate(groupColumn, sum(aggregatedColumn), rawSum => rawSum === null ? null : parseFloat(rawSum));
+        return this.groupedAggregate(groupColumn, sum(this.namespaceColumn(aggregatedColumn)), rawSum => rawSum === null ? null : parseFloat(rawSum));
     }
     /**
      * Retrieves the average value of the specified column
@@ -580,7 +580,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
             bypassSelectAll: true,
             bypassOrder: true,
         });
-        kyselyQuery = kyselyQuery.select(avg(columnName));
+        kyselyQuery = kyselyQuery.select(avg(this.namespaceColumn(columnName)));
         const data = await executeDatabaseQuery(kyselyQuery, 'executeTakeFirstOrThrow');
         return data.avg;
     }
@@ -600,7 +600,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
     async avgBy(groupColumn, aggregatedColumn) {
         // eslint-disable-next-line @typescript-eslint/unbound-method
         const { avg } = this.dbFor('select').fn;
-        return this.groupedAggregate(groupColumn, avg(aggregatedColumn));
+        return this.groupedAggregate(groupColumn, avg(this.namespaceColumn(aggregatedColumn)));
     }
     /**
      * Retrieves the number of records in the database

package/dist/types/src/Dream.d.ts

@@ -8,7 +8,7 @@ import LoadBuilder from './dream/LoadBuilder.js';
 import Query from './dream/Query.js';
 import { OnStatementForSpecificColumns, PassthroughOnClause, WhereStatement } from './types/associations/shared.js';
 import { AssociationTableNames, DbConnectionType } from './types/db.js';
-import { AllDefaultScopeNames, AssociationNameToDream, AttributeKeys, CreateOrFindByExtraOpts, DefaultOrNamedScopeName, DreamAssociationNames, DreamAssociationNamesWithoutRequiredOnClauses, DreamAssociationNamesWithPassthroughOnClauses, DreamAssociationNamesWithRequiredOnClauses, DreamAttributes, DreamBelongsToAssociationNames, DreamColumnNames, DreamHasManyAssociationNames, DreamHasOneAssociationNames, DreamModelAssociationNames, DreamPrimaryKeyType, DreamSerializerKey, FindablePropertiesForClass, GlobalModelNames, GlobalSerializerName, JoinAndStatements, OrderDir, PassthroughColumnNames, PassthroughOnClauseKeys, PluckEachArgs, PrimaryKeyForFind, RequiredOnClauseKeys, TableColumnNames, UpdateableAssociationProperties, UpdateableProperties, UpdateablePropertiesForClass, UpdateOrCreateByExtraOpts } from './types/dream.js';
+import { AllDefaultScopeNames, AssociationNameToDream, AttributeKeys, CreateOrFindByExtraOpts, DefaultOrNamedScopeName, DreamAssociationNames, DreamAssociationNamesWithoutRequiredOnClauses, DreamAssociationNamesWithPassthroughOnClauses, DreamAssociationNamesWithRequiredOnClauses, DreamAttributes, DreamBelongsToAssociationNames, DreamColumnNames, DreamHasManyAssociationNames, DreamHasOneAssociationNames, DreamModelAssociationNames, DreamPrimaryKeyType, DreamSerializerKey, FindablePropertiesForClass, GlobalModelNames, GlobalSerializerName, JoinAndStatements, OrderDir, PassthroughColumnNames, PassthroughOnClauseKeys, PluckEachArgs, PrimaryKeyForFind, RequiredOnClauseKeys, TableColumnNames, UpdateableAssociationProperties, UpdateableProperties, UpdateablePropertiesForClass, UpdateOrCreateByExtraOpts, ValidatedPluckEachColumnNames } from './types/dream.js';
 import { BaseModelColumnTypes, CursorPaginatedDreamQueryOptions, CursorPaginatedDreamQueryResult, DefaultQueryTypeOptions, FindEachOpts, LoadForModifierFn, PaginatedDreamQueryOptions, PaginatedDreamQueryResult, QueryWithJoinedAssociationsType, QueryWithJoinedAssociationsTypeAndNoPreload } from './types/query.js';
 import { DreamModelSerializerType, SimpleObjectSerializerType } from './types/serializer.js';
 import { ValidationType } from './types/validation.js';
@@ -1445,7 +1445,8 @@ export default class Dream {
      * @param args - a list of fields to pluck, followed by a callback function to call for each set of found fields
      * @returns void
      */
-    static pluckEach<T extends typeof Dream, I extends InstanceType<T>, ColumnNames extends TableColumnNames<I['DB'], I['table']>[], CbArgTypes extends BaseModelColumnTypes<ColumnNames, I>>(this: T, ...args: PluckEachArgs<ColumnNames, CbArgTypes>): Promise<void>;
+    static pluckEach<T extends typeof Dream, I extends InstanceType<T>, const ColumnNames extends unknown[]>(this: T, ...args: PluckEachArgs<ValidatedPluckEachColumnNames<ColumnNames, TableColumnNames<I['DB'], I['table']>>, BaseModelColumnTypes<ValidatedPluckEachColumnNames<ColumnNames, TableColumnNames<I['DB'], I['table']>>, I>>): Promise<void>;
+    static pluckEach<T extends typeof Dream, I extends InstanceType<T>, const ColumnNames extends TableColumnNames<I['DB'], I['table']>[]>(this: T, ...args: PluckEachArgs<ColumnNames, BaseModelColumnTypes<ColumnNames, I>>): Promise<void>;
     /**
      * Used in conjunction with the Sortable decorator, `resort`
      * takes a list of sortable fields, and for each one, finds and

package/dist/types/src/dream/DreamClassTransactionBuilder.d.ts

@@ -1,7 +1,7 @@
 import { SelectArg, SelectExpression } from 'kysely';
 import Dream from '../Dream.js';
 import { PassthroughOnClause, WhereStatement } from '../types/associations/shared.js';
-import { CreateOrFindByExtraOpts, DefaultScopeName, DreamColumnNames, DreamSerializerKey, FindablePropertiesForClass, OrderDir, PassthroughColumnNames, PluckEachArgs, PrimaryKeyForFind, TableColumnNames, UpdateableProperties, UpdateOrCreateByExtraOpts } from '../types/dream.js';
+import { CreateOrFindByExtraOpts, DefaultScopeName, DreamColumnNames, DreamSerializerKey, FindablePropertiesForClass, OrderDir, PassthroughColumnNames, PluckEachArgs, PrimaryKeyForFind, TableColumnNames, UpdateableProperties, UpdateOrCreateByExtraOpts, ValidatedPluckEachColumnNames } from '../types/dream.js';
 import { BaseModelColumnTypes, FindEachOpts, LoadForModifierFn, QueryWithJoinedAssociationsType, QueryWithJoinedAssociationsTypeAndNoPreload } from '../types/query.js';
 import { JoinedAssociation, JoinedAssociationsTypeFromAssociations, VariadicJoinsArgs, VariadicLeftJoinLoadArgs, VariadicLoadArgs } from '../types/variadic.js';
 import DreamTransaction from './DreamTransaction.js';
@@ -730,7 +730,8 @@ export default class DreamClassTransactionBuilder<DreamClass extends typeof Drea
      * @param fields - A list of fields to pluck, followed by a callback function to call for each set of found fields
      * @returns void
      */
-    pluckEach<I extends DreamClassTransactionBuilder<DreamClass, DreamInstance>, ColumnName extends keyof UpdateableProperties<DreamInstance>, ColumnNames extends ColumnName[], CbArgTypes extends BaseModelColumnTypes<ColumnNames, DreamInstance>>(this: I, ...args: PluckEachArgs<ColumnNames, CbArgTypes>): Promise<void>;
+    pluckEach<I extends DreamClassTransactionBuilder<DreamClass, DreamInstance>, const ColumnNames extends unknown[]>(this: I, ...args: PluckEachArgs<ValidatedPluckEachColumnNames<ColumnNames, keyof UpdateableProperties<DreamInstance>>, BaseModelColumnTypes<ValidatedPluckEachColumnNames<ColumnNames, keyof UpdateableProperties<DreamInstance>>, DreamInstance>>): Promise<void>;
+    pluckEach<I extends DreamClassTransactionBuilder<DreamClass, DreamInstance>, const ColumnNames extends (keyof UpdateableProperties<DreamInstance>)[]>(this: I, ...args: PluckEachArgs<ColumnNames, BaseModelColumnTypes<ColumnNames, DreamInstance>>): Promise<void>;
     /**
      * Sends data through for use as passthrough data
      * for the associations that require it.

package/dist/types/src/dream/Query.d.ts

@@ -2,7 +2,7 @@ import { DeleteQueryBuilder, SelectQueryBuilder, UpdateQueryBuilder } from 'kyse
 import Dream from '../Dream.js';
 import { ColumnNamesAccountingForJoinedAssociations, InternalWhereStatement, LimitStatement, OffsetStatement, OrderQueryStatement, PassthroughOnClause, WhereStatement, WhereStatementForJoinedAssociation } from '../types/associations/shared.js';
 import { DbConnectionType } from '../types/db.js';
-import { AllDefaultScopeNames, DefaultScopeName, DreamColumnNames, DreamConstructorType, DreamSerializerKey, DreamTableSchema, OrderDir, PassthroughColumnNames, PluckEachArgs, PrimaryKeyForFind, RelaxedJoinAndStatement, RelaxedJoinStatement, RelaxedPreloadOnStatement, RelaxedPreloadStatement, TableColumnNames, TableOrAssociationName, UpdateableProperties } from '../types/dream.js';
+import { AllDefaultScopeNames, DefaultScopeName, DreamColumnNames, DreamConstructorType, DreamSerializerKey, DreamTableSchema, OrderDir, PassthroughColumnNames, PluckEachArgs, PrimaryKeyForFind, RelaxedJoinAndStatement, RelaxedJoinStatement, RelaxedPreloadOnStatement, RelaxedPreloadStatement, TableColumnNames, TableOrAssociationName, UpdateableProperties, ValidatedPluckEachColumnNames } from '../types/dream.js';
 import { CursorPaginatedDreamQueryOptions, CursorPaginatedDreamQueryResult, DefaultQueryTypeOptions, ExtendQueryType, LoadForModifierFn, NamespacedOrBaseModelColumnTypes, PaginatedDreamQueryOptions, PaginatedDreamQueryResult, QueryToKyselyDBType, QueryToKyselyTableNamesType } from '../types/query.js';
 import { JoinedAssociation, JoinedAssociationsTypeFromAssociations, QueryTypeOptions, VariadicJoinsArgs, VariadicLeftJoinLoadArgs, VariadicLoadArgs } from '../types/variadic.js';
 import DreamTransaction from './DreamTransaction.js';
@@ -1006,7 +1006,8 @@ export default class Query<DreamInstance extends Dream, QueryTypeOpts extends Re
      * @returns void
      * @throws BatchingIncompatibleWithLimitOrOffset if the query carries a `limit` or `offset`
      */
-    pluckEach<Q extends Query<DreamInstance, QueryTypeOpts>, DB extends DreamInstance['DB'], const ColumnNames extends ColumnNamesAccountingForJoinedAssociations<Q['queryTypeOpts']['joinedAssociations'], DB, QueryTypeOpts['rootTableName'], QueryTypeOpts['rootTableAlias']>[], CbArgTypes extends NamespacedOrBaseModelColumnTypes<ColumnNames, Q, DreamInstance>>(this: Q, ...args: PluckEachArgs<ColumnNames, CbArgTypes>): Promise<void>;
+    pluckEach<Q extends Query<DreamInstance, QueryTypeOpts>, const ColumnNames extends unknown[]>(this: Q, ...args: PluckEachArgs<ValidatedPluckEachColumnNames<ColumnNames, ColumnNamesAccountingForJoinedAssociations<Q['queryTypeOpts']['joinedAssociations'], DreamInstance['DB'], QueryTypeOpts['rootTableName'], QueryTypeOpts['rootTableAlias']>>, NamespacedOrBaseModelColumnTypes<ValidatedPluckEachColumnNames<ColumnNames, ColumnNamesAccountingForJoinedAssociations<Q['queryTypeOpts']['joinedAssociations'], DreamInstance['DB'], QueryTypeOpts['rootTableName'], QueryTypeOpts['rootTableAlias']>>, Q, DreamInstance>>): Promise<void>;
+    pluckEach<Q extends Query<DreamInstance, QueryTypeOpts>, const ColumnNames extends ColumnNamesAccountingForJoinedAssociations<Q['queryTypeOpts']['joinedAssociations'], DreamInstance['DB'], QueryTypeOpts['rootTableName'], QueryTypeOpts['rootTableAlias']>[]>(this: Q, ...args: PluckEachArgs<ColumnNames, NamespacedOrBaseModelColumnTypes<ColumnNames, Q, DreamInstance>>): Promise<void>;
     /**
      * Retrieves an array containing all records matching the Query.
      * Be careful using this, since it will attempt to pull every

package/dist/types/src/types/associations/shared.d.ts

@@ -29,7 +29,7 @@ type NonKyselySupportedSupplementalWhereClauseValues<DB, Schema, TableName, Colu
 export type WhereStatementForDreamClass<DreamClass extends typeof Dream> = WhereStatement<InstanceType<DreamClass>>;
 export type WhereStatementForDream<DreamInstance extends Dream> = WhereStatement<DreamInstance>;
 type AssociationNameToDotReferencedColumns<DB, TableName extends keyof DB, AssociationName> = `${AssociationName & string}.${TableColumnNames<DB, TableName>}`;
-export type ColumnNamesAccountingForJoinedAssociations<JoinedAssociations extends Readonly<JoinedAssociation[]>, DB, RootTableName extends keyof DB, RootTableAlias extends string> = JoinedAssociations['length'] extends 0 ? TableColumnNames<DB, RootTableName> : JoinedAssociationColumnNames<JoinedAssociations, DB, AssociationNameToDotReferencedColumns<DB, RootTableName & keyof DB, RootTableAlias>>;
+export type ColumnNamesAccountingForJoinedAssociations<JoinedAssociations extends Readonly<JoinedAssociation[]>, DB, RootTableName extends keyof DB, RootTableAlias extends string> = JoinedAssociations['length'] extends 0 ? TableColumnNames<DB, RootTableName> : TableColumnNames<DB, RootTableName> | JoinedAssociationColumnNames<JoinedAssociations, DB, AssociationNameToDotReferencedColumns<DB, RootTableName & keyof DB, RootTableAlias>>;
 type JoinedAssociationColumnNames<JoinedAssociations extends Readonly<JoinedAssociation[]>, DB, AllColumnNames, Depth extends number = 0, CurrentJoinedAssociation = Readonly<JoinedAssociations[0]>, NextTableName = CurrentJoinedAssociation extends Readonly<JoinedAssociation> ? CurrentJoinedAssociation['table'] : never, NextAssociationName = CurrentJoinedAssociation extends Readonly<JoinedAssociation> ? CurrentJoinedAssociation['alias'] : never> = JoinedAssociations['length'] extends 0 ? AllColumnNames : Depth extends MAX_JOINED_TABLES_DEPTH ? AllColumnNames : JoinedAssociationColumnNames<ReadonlyTail<JoinedAssociations>, DB, AllColumnNames | AssociationNameToDotReferencedColumns<DB, NextTableName & keyof DB, NextAssociationName>, Inc<Depth>>;
 type Whereable<R> = {
     [K in keyof Selectable<R>]?: Selectable<R>[K] | Selectable<R>[K][];

package/dist/types/src/types/dream.d.ts

@@ -265,4 +265,7 @@ export type AllDefaultScopeNames<DreamConf, ConnectionTypeConfig = DreamConf['co
 export type NamedScopeName<DreamInstance extends Dream, Schema = DreamInstance['schema'], SchemaTable = Schema[DreamInstance['table'] & keyof Schema], SchemaNamedScopes extends string[] = SchemaTable['scopes' & keyof SchemaTable]['named' & keyof SchemaTable['scopes' & keyof SchemaTable]] & string[]> = SchemaNamedScopes[number];
 export type DefaultOrNamedScopeName<DreamInstance extends Dream> = DefaultScopeName<DreamInstance> | NamedScopeName<DreamInstance>;
 export type PluckEachArgs<ColumnNames extends unknown[], CbArgTypes extends unknown[]> = [...fields: ColumnNames] | [...fields: ColumnNames, callback: (...values: CbArgTypes) => void | Promise<void>] | [...fields: ColumnNames, callback: (...values: CbArgTypes) => void | Promise<void>, opts: FindEachOpts];
+export type ValidatedPluckEachColumnNames<ColumnNames extends unknown[], AllowedColumnName> = {
+    [Index in keyof ColumnNames]: ColumnNames[Index] extends AllowedColumnName ? ColumnNames[Index] : AllowedColumnName;
+};
 export {};

package/dist/types/src/types/query.d.ts

@@ -46,7 +46,7 @@ export type ExtendQueryType<OriginalOpts extends Readonly<QueryTypeOptions>, Opt
     allowOffset: Opts['allowOffset'] extends false ? false : OriginalOpts['allowOffset'];
     allowPaginate: Opts['allowPaginate'] extends false ? false : OriginalOpts['allowPaginate'];
 }>;
-export type NamespacedColumnType<ColumnName, Q extends Query<any, any>, DreamInstance extends Dream, JoinedAssociationsArr = Q['queryTypeOpts']['joinedAssociations'], AssociationName = ColumnName extends `${infer Name extends string}.${string}` ? Name : never, RealColumnName = ColumnName extends `${string}.${infer Col extends string}` ? Col : never, JoinedAssociation extends FindInterfaceWithValue<JoinedAssociationsArr, 'alias', AssociationName> = FindInterfaceWithValue<JoinedAssociationsArr, 'alias', AssociationName>, JoinedTable = JoinedAssociation['table'] extends never ? DreamInstance['table'] : JoinedAssociation['table'], ReturnType = ModelColumnType<DreamInstance['schema'], JoinedTable, RealColumnName>> = ReturnType;
+export type NamespacedColumnType<ColumnName, Q extends Query<any, any>, DreamInstance extends Dream, JoinedAssociationsArr = Q['queryTypeOpts']['joinedAssociations'], AssociationName = ColumnName extends `${infer Name extends string}.${string}` ? Name : never, RealColumnName = ColumnName extends `${string}.${infer Col extends string}` ? Col : ColumnName, JoinedAssociation extends FindInterfaceWithValue<JoinedAssociationsArr, 'alias', AssociationName> = FindInterfaceWithValue<JoinedAssociationsArr, 'alias', AssociationName>, JoinedTable = JoinedAssociation['table'] extends never ? DreamInstance['table'] : JoinedAssociation['table'], ReturnType = ModelColumnType<DreamInstance['schema'], JoinedTable, RealColumnName>> = ReturnType;
 type NamespacedColumnTypes<ColumnNames, Q extends Query<any, any>, DreamInstance extends Dream> = ColumnNames extends Readonly<[infer First, ...infer Rest]> ? [
     NamespacedColumnType<First, Q, DreamInstance>,
     ...NamespacedColumnTypes<Readonly<Rest>, Q, DreamInstance>

package/dist/types/src/types/types/associations/shared.ts

@@ -216,12 +216,14 @@ export type ColumnNamesAccountingForJoinedAssociations<
   RootTableAlias extends string,
 > = JoinedAssociations['length'] extends 0
   ? TableColumnNames<DB, RootTableName> // no associations; simply return the un-namespaced columns for the root table
-  : JoinedAssociationColumnNames<
-      JoinedAssociations,
-      DB,
-      // namespace columns for the root table
-      AssociationNameToDotReferencedColumns<DB, RootTableName & keyof DB, RootTableAlias>
-    >
+  :
+      | TableColumnNames<DB, RootTableName>
+      | JoinedAssociationColumnNames<
+          JoinedAssociations,
+          DB,
+          // namespace columns for the root table
+          AssociationNameToDotReferencedColumns<DB, RootTableName & keyof DB, RootTableAlias>
+        >
 type JoinedAssociationColumnNames<
   JoinedAssociations extends Readonly<JoinedAssociation[]>,
   DB,

package/dist/types/src/types/types/dream.ts

@@ -925,3 +925,9 @@ export type PluckEachArgs<ColumnNames extends unknown[], CbArgTypes extends unkn
   | [...fields: ColumnNames]
   | [...fields: ColumnNames, callback: (...values: CbArgTypes) => void | Promise<void>]
   | [...fields: ColumnNames, callback: (...values: CbArgTypes) => void | Promise<void>, opts: FindEachOpts]
+
+export type ValidatedPluckEachColumnNames<ColumnNames extends unknown[], AllowedColumnName> = {
+  [Index in keyof ColumnNames]: ColumnNames[Index] extends AllowedColumnName
+    ? ColumnNames[Index]
+    : AllowedColumnName
+}

package/dist/types/src/types/types/query.ts

@@ -101,7 +101,7 @@ export type NamespacedColumnType<
   // begin: inferred types
   JoinedAssociationsArr = Q['queryTypeOpts']['joinedAssociations'],
   AssociationName = ColumnName extends `${infer Name extends string}.${string}` ? Name : never,
-  RealColumnName = ColumnName extends `${string}.${infer Col extends string}` ? Col : never,
+  RealColumnName = ColumnName extends `${string}.${infer Col extends string}` ? Col : ColumnName,
   JoinedAssociation extends FindInterfaceWithValue<
     JoinedAssociationsArr,
     'alias',