@rvoh/dream 2.40.2 → 2.41.0

package/dist/cjs/src/Dream.js

@@ -20,6 +20,7 @@ import destroyDream from './dream/internal/destroyDream.js';
 import { destroyOptions, reallyDestroyOptions, undestroyOptions } from './dream/internal/destroyOptions.js';
 import ensureSTITypeFieldIsSet from './dream/internal/ensureSTITypeFieldIsSet.js';
 import findOrCreateBy from './dream/internal/findOrCreateBy.js';
+import findOrCreateLookupStatement from './dream/internal/findOrCreateLookupStatement.js';
 import mergeSerializerAssociationEdges from './dream/internal/mergeSerializerAssociationEdges.js';
 import printSerializerHierarchyLevel from './dream/internal/printSerializerHierarchyLevel.js';
 import reload from './dream/internal/reload.js';
@@ -1288,7 +1289,7 @@ export default class Dream {
         }
         catch (err) {
             if (pgErrorType(err) === UNIQUE_VIOLATION) {
-                const dreamModel = await this.findBy(this.extractAttributesFromUpdateableProperties(attributes));
+                const dreamModel = await this.findBy(findOrCreateLookupStatement(this, attributes));
                 if (!dreamModel)
                     throw new CreateOrFindByFailedToCreateAndFind(this);
                 return dreamModel;
@@ -1342,7 +1343,7 @@ export default class Dream {
         }
         catch (err) {
             if (pgErrorType(err) === UNIQUE_VIOLATION) {
-                const existingRecord = await this.findBy(this.extractAttributesFromUpdateableProperties(attributes));
+                const existingRecord = await this.findBy(findOrCreateLookupStatement(this, attributes));
                 if (!existingRecord)
                     throw new CreateOrUpdateByFailedToCreateAndUpdate(this);
                 const { with: attrs } = extraOpts;

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

@@ -1,7 +1,6 @@
+import findOrCreateLookupStatement from './findOrCreateLookupStatement.js';
 export default async function findOrCreateBy(dreamClass, txn = null, attributes, extraOpts = {}) {
-    const existingRecord = await dreamClass
-        .txn(txn)
-        .findBy(dreamClass['extractAttributesFromUpdateableProperties'](attributes));
+    const existingRecord = await dreamClass.txn(txn).findBy(findOrCreateLookupStatement(dreamClass, attributes));
     if (existingRecord)
         return existingRecord;
     const { createWith, skipHooks } = extraOpts;

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

@@ -0,0 +1,19 @@
+import isDatabaseArrayColumn from '../../helpers/db/types/isDatabaseArrayColumn.js';
+import ops from '../../ops/index.js';
+/**
+ * Builds the `findBy` statement that findOrCreateBy, createOrFindBy,
+ * updateOrCreateBy and createOrUpdateBy use to look up an existing record.
+ * Their attributes are both the lookup and the values to persist, so an array
+ * given for an array column is the whole array to store: the lookup compares
+ * it with `ops.equal`, matching only a record whose array equals it
+ * element-for-element, in order, instead of the `IN` a plain list means in a
+ * where clause. PostgreSQL defines no equality operator for `json`, so on a
+ * `json[]` column this lookup raises at the database, as `ops.equal` does.
+ */
+export default function findOrCreateLookupStatement(dreamClass, attributes) {
+    const lookup = dreamClass['extractAttributesFromUpdateableProperties'](attributes);
+    return Object.fromEntries(Object.entries(lookup).map(([column, value]) => [
+        column,
+        Array.isArray(value) && isDatabaseArrayColumn(dreamClass, column) ? ops.equal(value) : value,
+    ]));
+}

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

@@ -1,8 +1,7 @@
+import findOrCreateLookupStatement from './findOrCreateLookupStatement.js';
 import saveDream from './saveDream.js';
 export default async function updateOrCreateBy(dreamClass, txn = null, attributes, extraOpts = {}) {
-    const existingRecord = await dreamClass
-        .txn(txn)
-        .findBy(dreamClass['extractAttributesFromUpdateableProperties'](attributes));
+    const existingRecord = await dreamClass.txn(txn).findBy(findOrCreateLookupStatement(dreamClass, attributes));
     const { with: attrs, skipHooks } = extraOpts;
     if (existingRecord) {
         existingRecord.assignAttributes(attrs ?? {});

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

@@ -38,11 +38,18 @@ function normalizedString(_val) {
     const normalizedValueArray = (alreadyAnArray ? _val : [_val]).map(val => typeof val === 'string' ? normalizeUnicode(val) : val);
     return alreadyAnArray ? normalizedValueArray : normalizedValueArray[0];
 }
+/**
+ * A value for a date or timestamp column (or an array of them) may be a single
+ * value, an array, or, as the `IN` operand against an array column, a list of
+ * whole arrays; every nested array is converted element by element.
+ */
 function dateTimeOrDateToSql(dateClass, _val) {
     const alreadyAnArray = Array.isArray(_val);
-    const normalizedValueArray = (alreadyAnArray ? _val : [_val]).map(val => {
+    const normalizedValueArray = (alreadyAnArray ? _val : [_val]).map((val) => {
         if (val === null || val === undefined)
             return val;
+        if (Array.isArray(val))
+            return dateTimeOrDateToSql(dateClass, val);
         if (val instanceof DateTime || val instanceof CalendarDate)
             return val.toSQL();
         try {
@@ -59,11 +66,18 @@ function dateTimeOrDateToSql(dateClass, _val) {
     });
     return alreadyAnArray ? normalizedValueArray : normalizedValueArray[0];
 }
+/**
+ * A value for a time column (or an array of them) may be a single value, an
+ * array, or, as the `IN` operand against an array column, a list of whole
+ * arrays; every nested array is converted element by element.
+ */
 function clockTimeOrClockTimeTzToSql(clockTimeClass, _val) {
     const alreadyAnArray = Array.isArray(_val);
-    const normalizedValueArray = (alreadyAnArray ? _val : [_val]).map(val => {
+    const normalizedValueArray = (alreadyAnArray ? _val : [_val]).map((val) => {
         if (val === null || val === undefined)
             return val;
+        if (Array.isArray(val))
+            return clockTimeOrClockTimeTzToSql(clockTimeClass, val);
         if (val instanceof BaseClockTime)
             return val.toSQL();
         try {

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

@@ -119,9 +119,13 @@ const ops = {
      *
      * **Array columns:** passing an array means literal array equality — the
      * whole array is bound as a single parameter, so the column must match
-     * element-for-element, in order. This is the opt-in counterpart to a bare
-     * array in a where clause (`Post.where({ tags: ['a', 'b'] })`), which means
-     * `IN`, and to `ops.any`, which tests for containment of a single element.
+     * element-for-element, in order. The plain value form of a where clause
+     * targets regular (scalar) columns, so comparing an array column against an
+     * array value goes through `ops`: a flat list against an array column
+     * (`Post.where({ tags: ['a', 'b'] })`) is a compile error. A list of whole
+     * arrays (`Post.where({ tags: [['a', 'b'], ['c']] })`) means `IN`, matching
+     * rows whose column equals any one of them, and `ops.any` tests for
+     * containment of a single element.
      * Element types are constrained by the column, so an enum array column
      * rejects a string that is not a member of its enum.
      *

package/dist/esm/src/Dream.js

@@ -20,6 +20,7 @@ import destroyDream from './dream/internal/destroyDream.js';
 import { destroyOptions, reallyDestroyOptions, undestroyOptions } from './dream/internal/destroyOptions.js';
 import ensureSTITypeFieldIsSet from './dream/internal/ensureSTITypeFieldIsSet.js';
 import findOrCreateBy from './dream/internal/findOrCreateBy.js';
+import findOrCreateLookupStatement from './dream/internal/findOrCreateLookupStatement.js';
 import mergeSerializerAssociationEdges from './dream/internal/mergeSerializerAssociationEdges.js';
 import printSerializerHierarchyLevel from './dream/internal/printSerializerHierarchyLevel.js';
 import reload from './dream/internal/reload.js';
@@ -1288,7 +1289,7 @@ export default class Dream {
         }
         catch (err) {
             if (pgErrorType(err) === UNIQUE_VIOLATION) {
-                const dreamModel = await this.findBy(this.extractAttributesFromUpdateableProperties(attributes));
+                const dreamModel = await this.findBy(findOrCreateLookupStatement(this, attributes));
                 if (!dreamModel)
                     throw new CreateOrFindByFailedToCreateAndFind(this);
                 return dreamModel;
@@ -1342,7 +1343,7 @@ export default class Dream {
         }
         catch (err) {
             if (pgErrorType(err) === UNIQUE_VIOLATION) {
-                const existingRecord = await this.findBy(this.extractAttributesFromUpdateableProperties(attributes));
+                const existingRecord = await this.findBy(findOrCreateLookupStatement(this, attributes));
                 if (!existingRecord)
                     throw new CreateOrUpdateByFailedToCreateAndUpdate(this);
                 const { with: attrs } = extraOpts;

package/dist/esm/src/dream/internal/findOrCreateBy.js

@@ -1,7 +1,6 @@
+import findOrCreateLookupStatement from './findOrCreateLookupStatement.js';
 export default async function findOrCreateBy(dreamClass, txn = null, attributes, extraOpts = {}) {
-    const existingRecord = await dreamClass
-        .txn(txn)
-        .findBy(dreamClass['extractAttributesFromUpdateableProperties'](attributes));
+    const existingRecord = await dreamClass.txn(txn).findBy(findOrCreateLookupStatement(dreamClass, attributes));
     if (existingRecord)
         return existingRecord;
     const { createWith, skipHooks } = extraOpts;

package/dist/esm/src/dream/internal/findOrCreateLookupStatement.js

@@ -0,0 +1,19 @@
+import isDatabaseArrayColumn from '../../helpers/db/types/isDatabaseArrayColumn.js';
+import ops from '../../ops/index.js';
+/**
+ * Builds the `findBy` statement that findOrCreateBy, createOrFindBy,
+ * updateOrCreateBy and createOrUpdateBy use to look up an existing record.
+ * Their attributes are both the lookup and the values to persist, so an array
+ * given for an array column is the whole array to store: the lookup compares
+ * it with `ops.equal`, matching only a record whose array equals it
+ * element-for-element, in order, instead of the `IN` a plain list means in a
+ * where clause. PostgreSQL defines no equality operator for `json`, so on a
+ * `json[]` column this lookup raises at the database, as `ops.equal` does.
+ */
+export default function findOrCreateLookupStatement(dreamClass, attributes) {
+    const lookup = dreamClass['extractAttributesFromUpdateableProperties'](attributes);
+    return Object.fromEntries(Object.entries(lookup).map(([column, value]) => [
+        column,
+        Array.isArray(value) && isDatabaseArrayColumn(dreamClass, column) ? ops.equal(value) : value,
+    ]));
+}

package/dist/esm/src/dream/internal/updateOrCreateBy.js

@@ -1,8 +1,7 @@
+import findOrCreateLookupStatement from './findOrCreateLookupStatement.js';
 import saveDream from './saveDream.js';
 export default async function updateOrCreateBy(dreamClass, txn = null, attributes, extraOpts = {}) {
-    const existingRecord = await dreamClass
-        .txn(txn)
-        .findBy(dreamClass['extractAttributesFromUpdateableProperties'](attributes));
+    const existingRecord = await dreamClass.txn(txn).findBy(findOrCreateLookupStatement(dreamClass, attributes));
     const { with: attrs, skipHooks } = extraOpts;
     if (existingRecord) {
         existingRecord.assignAttributes(attrs ?? {});

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

@@ -38,11 +38,18 @@ function normalizedString(_val) {
     const normalizedValueArray = (alreadyAnArray ? _val : [_val]).map(val => typeof val === 'string' ? normalizeUnicode(val) : val);
     return alreadyAnArray ? normalizedValueArray : normalizedValueArray[0];
 }
+/**
+ * A value for a date or timestamp column (or an array of them) may be a single
+ * value, an array, or, as the `IN` operand against an array column, a list of
+ * whole arrays; every nested array is converted element by element.
+ */
 function dateTimeOrDateToSql(dateClass, _val) {
     const alreadyAnArray = Array.isArray(_val);
-    const normalizedValueArray = (alreadyAnArray ? _val : [_val]).map(val => {
+    const normalizedValueArray = (alreadyAnArray ? _val : [_val]).map((val) => {
         if (val === null || val === undefined)
             return val;
+        if (Array.isArray(val))
+            return dateTimeOrDateToSql(dateClass, val);
         if (val instanceof DateTime || val instanceof CalendarDate)
             return val.toSQL();
         try {
@@ -59,11 +66,18 @@ function dateTimeOrDateToSql(dateClass, _val) {
     });
     return alreadyAnArray ? normalizedValueArray : normalizedValueArray[0];
 }
+/**
+ * A value for a time column (or an array of them) may be a single value, an
+ * array, or, as the `IN` operand against an array column, a list of whole
+ * arrays; every nested array is converted element by element.
+ */
 function clockTimeOrClockTimeTzToSql(clockTimeClass, _val) {
     const alreadyAnArray = Array.isArray(_val);
-    const normalizedValueArray = (alreadyAnArray ? _val : [_val]).map(val => {
+    const normalizedValueArray = (alreadyAnArray ? _val : [_val]).map((val) => {
         if (val === null || val === undefined)
             return val;
+        if (Array.isArray(val))
+            return clockTimeOrClockTimeTzToSql(clockTimeClass, val);
         if (val instanceof BaseClockTime)
             return val.toSQL();
         try {

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

@@ -119,9 +119,13 @@ const ops = {
      *
      * **Array columns:** passing an array means literal array equality — the
      * whole array is bound as a single parameter, so the column must match
-     * element-for-element, in order. This is the opt-in counterpart to a bare
-     * array in a where clause (`Post.where({ tags: ['a', 'b'] })`), which means
-     * `IN`, and to `ops.any`, which tests for containment of a single element.
+     * element-for-element, in order. The plain value form of a where clause
+     * targets regular (scalar) columns, so comparing an array column against an
+     * array value goes through `ops`: a flat list against an array column
+     * (`Post.where({ tags: ['a', 'b'] })`) is a compile error. A list of whole
+     * arrays (`Post.where({ tags: [['a', 'b'], ['c']] })`) means `IN`, matching
+     * rows whose column equals any one of them, and `ops.any` tests for
+     * containment of a single element.
      * Element types are constrained by the column, so an enum array column
      * rejects a string that is not a member of its enum.
      *

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

@@ -0,0 +1,14 @@
+import Dream from '../../Dream.js';
+import { WhereStatement } from '../../types/associations/shared.js';
+import { UpdateablePropertiesForClass } from '../../types/dream.js';
+/**
+ * Builds the `findBy` statement that findOrCreateBy, createOrFindBy,
+ * updateOrCreateBy and createOrUpdateBy use to look up an existing record.
+ * Their attributes are both the lookup and the values to persist, so an array
+ * given for an array column is the whole array to store: the lookup compares
+ * it with `ops.equal`, matching only a record whose array equals it
+ * element-for-element, in order, instead of the `IN` a plain list means in a
+ * where clause. PostgreSQL defines no equality operator for `json`, so on a
+ * `json[]` column this lookup raises at the database, as `ops.equal` does.
+ */
+export default function findOrCreateLookupStatement<T extends typeof Dream>(dreamClass: T, attributes: UpdateablePropertiesForClass<T>): WhereStatement<InstanceType<T>>;

package/dist/types/src/ops/index.d.ts

@@ -114,9 +114,13 @@ declare const ops: {
      *
      * **Array columns:** passing an array means literal array equality — the
      * whole array is bound as a single parameter, so the column must match
-     * element-for-element, in order. This is the opt-in counterpart to a bare
-     * array in a where clause (`Post.where({ tags: ['a', 'b'] })`), which means
-     * `IN`, and to `ops.any`, which tests for containment of a single element.
+     * element-for-element, in order. The plain value form of a where clause
+     * targets regular (scalar) columns, so comparing an array column against an
+     * array value goes through `ops`: a flat list against an array column
+     * (`Post.where({ tags: ['a', 'b'] })`) is a compile error. A list of whole
+     * arrays (`Post.where({ tags: [['a', 'b'], ['c']] })`) means `IN`, matching
+     * rows whose column equals any one of them, and `ops.any` tests for
+     * containment of a single element.
      * Element types are constrained by the column, so an enum array column
      * rejects a string that is not a member of its enum.
      *

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

@@ -25,23 +25,25 @@ export type PassthroughOnClause<PassthroughColumns extends string[]> = Partial<R
 type DreamSelectable<DB, Schema, TableName extends AssociationTableNames<DB, Schema> & keyof DB> = Partial<{
     [ColumnName in keyof DB[TableName]]: NonKyselySupportedSupplementalWhereClauseValues<DB, Schema, TableName, ColumnName>;
 }>;
-type NonKyselySupportedSupplementalWhereClauseValues<DB, Schema, TableName, Column, ModelPropertyType = ModelColumnType<Schema, TableName, Column>, ColumnType = TableColumnType<Schema, TableName, Column>, EnumTypeArray extends string[] | null = TableColumnEnumTypeArray<Schema, TableName, Column>, IsArrayColumn = TableColumnIsArray<Schema, TableName, Column>, PermanentOpsValTypes = null | readonly [], ArrayElementType = ModelPropertyType extends readonly (infer ElementType)[] ? ElementType : never, ArrayOpsValType = readonly ArrayElementType[] | PermanentOpsValTypes | RawBuilder<unknown>, OpsValType = IsArrayColumn extends true ? ArrayElementType | PermanentOpsValTypes : EnumTypeArray extends null ? ColumnType extends 'bigint' ? TypesAllowedForBigintAgainstTheDb | PermanentOpsValTypes : ModelPropertyType extends DateTime | CalendarDate ? DateTime | CalendarDate | null : ModelPropertyType extends ClockTime ? ClockTime | null : ModelPropertyType extends ClockTimeTz ? ClockTimeTz | null : ModelPropertyType extends number | string ? ModelPropertyType | PermanentOpsValTypes : never : EnumTypeArray extends string[] ? EnumTypeArray[number] | PermanentOpsValTypes : never, ResolvedOpsValType = OpsValType | RawBuilder<unknown>, PartialTypes = IsArrayColumn extends true ? (EnumTypeArray extends string[] ? EnumTypeArray : never) | OpsStatement<'=' | '!=' | '<>', ArrayOpsValType, any> | OpsStatement<KyselyComparisonOperatorExpression, PermanentOpsValTypes | RawBuilder<unknown>, any> : EnumTypeArray extends null ? ModelPropertyType extends DateTime ? Range<DateTime | CalendarDate> | Range<null, DateTime | CalendarDate> | (() => Range<DateTime | CalendarDate>) | (() => Range<null, DateTime | CalendarDate>) | OpsStatement<KyselyComparisonOperatorExpression, ResolvedOpsValType, any> : ModelPropertyType extends ClockTime ? Range<ClockTime> | Range<null, ClockTime> | (() => Range<ClockTime>) | (() => Range<null, ClockTime>) | OpsStatement<KyselyComparisonOperatorExpression, ResolvedOpsValType, any> : ModelPropertyType extends ClockTimeTz ? Range<ClockTimeTz> | Range<null, ClockTimeTz> | (() => Range<ClockTimeTz>) | (() => Range<null, ClockTimeTz>) | OpsStatement<KyselyComparisonOperatorExpression, ResolvedOpsValType, any> : ModelPropertyType extends CalendarDate ? Range<DateTime | CalendarDate> | Range<null, DateTime | CalendarDate> | (() => Range<DateTime | CalendarDate>) | (() => Range<null, DateTime | CalendarDate>) | OpsStatement<KyselyComparisonOperatorExpression, ResolvedOpsValType> : ColumnType extends 'bigint' ? Range<TypesAllowedForBigintAgainstTheDb> | Range<null, TypesAllowedForBigintAgainstTheDb> | OpsStatement<KyselyComparisonOperatorExpression, ResolvedOpsValType, any> : ModelPropertyType extends number ? Range<ModelPropertyType> | Range<null, ModelPropertyType> | OpsStatement<KyselyComparisonOperatorExpression, ResolvedOpsValType, any> : ModelPropertyType extends string ? Range<string> | Range<null, string> | OpsStatement<KyselyComparisonOperatorExpression, string, any> | OpsStatement<TrigramOperator, ResolvedOpsValType, ExtraSimilarityArgs> : never : EnumTypeArray extends string[] ? EnumTypeArray | OpsStatement<KyselyComparisonOperatorExpression, ResolvedOpsValType, any> : never> = PartialTypes extends never ? OpsStatement<KyselyComparisonOperatorExpression, ResolvedOpsValType, any> | CurriedOpsStatement<any, any, any, ResolvedOpsValType> | SelectQueryBuilder<DB, keyof DB, any> : PartialTypes | CurriedOpsStatement<any, any, any, ResolvedOpsValType> | SelectQueryBuilder<DB, keyof DB, any>;
+type NonKyselySupportedSupplementalWhereClauseValues<DB, Schema, TableName, Column, ModelPropertyType = ModelColumnType<Schema, TableName, Column>, ColumnType = TableColumnType<Schema, TableName, Column>, EnumTypeArray extends string[] | null = TableColumnEnumTypeArray<Schema, TableName, Column>, IsArrayColumn = TableColumnIsArray<Schema, TableName, Column>, PermanentOpsValTypes = null | readonly [], ArrayElementType = ModelPropertyType extends readonly (infer ElementType)[] ? ElementType : never, ArrayOpsValType = readonly ArrayElementType[] | PermanentOpsValTypes | RawBuilder<unknown>, OpsValType = IsArrayColumn extends true ? ArrayElementType | PermanentOpsValTypes : EnumTypeArray extends null ? ColumnType extends 'bigint' ? TypesAllowedForBigintAgainstTheDb | PermanentOpsValTypes : ModelPropertyType extends DateTime | CalendarDate ? DateTime | CalendarDate | null : ModelPropertyType extends ClockTime ? ClockTime | null : ModelPropertyType extends ClockTimeTz ? ClockTimeTz | null : ModelPropertyType extends number | string ? ModelPropertyType | PermanentOpsValTypes : never : EnumTypeArray extends string[] ? EnumTypeArray[number] | PermanentOpsValTypes : never, ResolvedOpsValType = OpsValType | RawBuilder<unknown>, PartialTypes = IsArrayColumn extends true ? OpsStatement<'=' | '!=' | '<>', ArrayOpsValType, any> | OpsStatement<KyselyComparisonOperatorExpression, PermanentOpsValTypes | RawBuilder<unknown>, any> : EnumTypeArray extends null ? ModelPropertyType extends DateTime ? Range<DateTime | CalendarDate> | Range<null, DateTime | CalendarDate> | (() => Range<DateTime | CalendarDate>) | (() => Range<null, DateTime | CalendarDate>) | OpsStatement<KyselyComparisonOperatorExpression, ResolvedOpsValType, any> : ModelPropertyType extends ClockTime ? Range<ClockTime> | Range<null, ClockTime> | (() => Range<ClockTime>) | (() => Range<null, ClockTime>) | OpsStatement<KyselyComparisonOperatorExpression, ResolvedOpsValType, any> : ModelPropertyType extends ClockTimeTz ? Range<ClockTimeTz> | Range<null, ClockTimeTz> | (() => Range<ClockTimeTz>) | (() => Range<null, ClockTimeTz>) | OpsStatement<KyselyComparisonOperatorExpression, ResolvedOpsValType, any> : ModelPropertyType extends CalendarDate ? Range<DateTime | CalendarDate> | Range<null, DateTime | CalendarDate> | (() => Range<DateTime | CalendarDate>) | (() => Range<null, DateTime | CalendarDate>) | OpsStatement<KyselyComparisonOperatorExpression, ResolvedOpsValType> : ColumnType extends 'bigint' ? Range<TypesAllowedForBigintAgainstTheDb> | Range<null, TypesAllowedForBigintAgainstTheDb> | OpsStatement<KyselyComparisonOperatorExpression, ResolvedOpsValType, any> : ModelPropertyType extends number ? Range<ModelPropertyType> | Range<null, ModelPropertyType> | OpsStatement<KyselyComparisonOperatorExpression, ResolvedOpsValType, any> : ModelPropertyType extends string ? Range<string> | Range<null, string> | OpsStatement<KyselyComparisonOperatorExpression, string, any> | OpsStatement<TrigramOperator, ResolvedOpsValType, ExtraSimilarityArgs> : never : EnumTypeArray extends string[] ? EnumTypeArray | OpsStatement<KyselyComparisonOperatorExpression, ResolvedOpsValType, any> : never> = PartialTypes extends never ? OpsStatement<KyselyComparisonOperatorExpression, ResolvedOpsValType, any> | CurriedOpsStatement<any, any, any, ResolvedOpsValType> | SelectQueryBuilder<DB, keyof DB, any> : PartialTypes | CurriedOpsStatement<any, any, any, ResolvedOpsValType> | SelectQueryBuilder<DB, keyof DB, any>;
 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> : 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][];
+type Whereable<DB, Schema, TableName extends keyof DB, R = DB[TableName]> = {
+    [K in keyof Selectable<R>]?: TableColumnIsArray<Schema, TableName, K> extends true ? Extract<Selectable<R>[K], null> | Selectable<R>[K][] : Selectable<R>[K] | Selectable<R>[K][];
 };
 type WhereableAssociatedModelParam<I extends Dream> = {
     [K in keyof AssociatedModelParam<I>]: AssociatedModelParam<I>[K] | NonNullable<AssociatedModelParam<I>[K]>[];
 };
 export type WhereStatement<I extends Dream> = InternalWhereStatement<I, I['DB'], I['schema'], I['table']>;
-export type InternalWhereStatement<I extends Dream, DB, Schema, TableName extends AssociationTableNames<DB, Schema> & keyof DB> = Partial<MergeUnionOfRecordTypes<Whereable<DB[TableName]> | DreamSelectable<DB, Schema, TableName> | WhereableAssociatedModelParam<I>>>;
+export type InternalWhereStatement<I extends Dream, DB, Schema, TableName extends AssociationTableNames<DB, Schema> & keyof DB> = Partial<MergeUnionOfRecordTypes<Whereable<DB, Schema, TableName> | DreamSelectable<DB, Schema, TableName> | WhereableAssociatedModelParam<I>>>;
 export type OnStatementForAssociation<I extends Dream, DB, Schema, TableName extends AssociationTableNames<DB, Schema> & keyof DB, RequiredOnClauseKeysForThisAssociation, OnStatement extends InternalWhereStatement<I, DB, Schema, TableName> = InternalWhereStatement<I, DB, Schema, TableName>> = RequiredOnClauseKeysForThisAssociation extends null ? InternalWhereStatement<I, DB, Schema, TableName> : RequiredOnClauseKeysForThisAssociation extends string[] ? Required<Pick<OnStatement, RequiredOnClauseKeysForThisAssociation[number] & keyof OnStatement>> & Partial<Omit<OnStatement, RequiredOnClauseKeysForThisAssociation[number] & keyof OnStatement>> : never;
 export type OnStatementForSpecificColumns<I extends Dream, DB, Schema, TableName extends AssociationTableNames<DB, Schema> & keyof DB, Columns extends string[], OnStatement extends InternalWhereStatement<I, DB, Schema, TableName> = InternalWhereStatement<I, DB, Schema, TableName>> = Pick<OnStatement, Columns[number] & keyof OnStatement>;
-type OnStatementForAssociationDefinition<DB, Schema, TableName extends AssociationTableNames<DB, Schema> & keyof DB> = Partial<MergeUnionOfRecordTypes<Partial<Selectable<DB[TableName]>> | Partial<{
+type OnStatementForAssociationDefinition<DB, Schema, TableName extends AssociationTableNames<DB, Schema> & keyof DB> = Partial<MergeUnionOfRecordTypes<Partial<{
+    [K in keyof Selectable<DB[TableName]>]: TableColumnIsArray<Schema, TableName, K> extends true ? Extract<Selectable<DB[TableName]>[K], null> | readonly [] : Selectable<DB[TableName]>[K];
+}> | Partial<{
     [ColumnName in keyof DB[TableName]]: NonKyselySupportedSupplementalWhereClauseValues<DB, Schema, TableName, ColumnName> | typeof DreamConst.passthrough | typeof DreamConst.required;
 }>>>;
 export type SelfOnStatement<BaseInstance extends Dream, DB, Schema, TableName extends AssociationTableNames<DB, Schema> & keyof DB> = Partial<Record<keyof DB[TableName], DreamColumnNames<BaseInstance>>>;

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

@@ -134,7 +134,6 @@ type NonKyselySupportedSupplementalWhereClauseValues<
   // a database error.
   PartialTypes = IsArrayColumn extends true
     ?
-        | (EnumTypeArray extends string[] ? EnumTypeArray : never)
         | OpsStatement<'=' | '!=' | '<>', ArrayOpsValType, any>
         | OpsStatement<KyselyComparisonOperatorExpression, PermanentOpsValTypes | RawBuilder<unknown>, any>
     : EnumTypeArray extends null
@@ -248,8 +247,22 @@ type JoinedAssociationColumnNames<
         Inc<Depth>
       >
 
-type Whereable<R> = {
-  [K in keyof Selectable<R>]?: Selectable<R>[K] | Selectable<R>[K][]
+// The plain value form of a where clause targets regular (scalar) columns: a
+// value means `=`, a list of values means `IN`, and `null` means `IS NULL`.
+// Comparing an array column against an array value goes through `ops`, e.g.
+// `Post.where({ tags: ops.equal(['a', 'b']) })`. An array column's plain value
+// is therefore limited to `null` and a list whose entries are each a whole
+// array or `null` (an `IN` of whole arrays, where `[]` matches nothing). A flat
+// list of elements against an array column, e.g.
+// `Post.where({ tags: ['a', 'b'] })`, is a compile error, since it is rendered
+// as the value list `IN ('a', 'b')`, which PostgreSQL rejects for an array
+// column unless every element is itself an array literal such as `'{a}'`.
+// Array-ness comes from the schema (`TableColumnIsArray`), not from the
+// Kysely column type, which also admits arrays for jsonb columns.
+type Whereable<DB, Schema, TableName extends keyof DB, R = DB[TableName]> = {
+  [K in keyof Selectable<R>]?: TableColumnIsArray<Schema, TableName, K> extends true
+    ? Extract<Selectable<R>[K], null> | Selectable<R>[K][]
+    : Selectable<R>[K] | Selectable<R>[K][]
 }
 
 // For filtering by BelongsTo model instance(s) in a where/and statement, e.g.
@@ -270,7 +283,9 @@ export type InternalWhereStatement<
   TableName extends AssociationTableNames<DB, Schema> & keyof DB,
 > = Partial<
   MergeUnionOfRecordTypes<
-    Whereable<DB[TableName]> | DreamSelectable<DB, Schema, TableName> | WhereableAssociatedModelParam<I>
+    | Whereable<DB, Schema, TableName>
+    | DreamSelectable<DB, Schema, TableName>
+    | WhereableAssociatedModelParam<I>
   >
 >
 
@@ -314,7 +329,14 @@ type OnStatementForAssociationDefinition<
   TableName extends AssociationTableNames<DB, Schema> & keyof DB,
 > = Partial<
   MergeUnionOfRecordTypes<
-    | Partial<Selectable<DB[TableName]>>
+    // As in `Whereable`, the plain value form targets regular (scalar) columns.
+    // An array column accepts only `null` and `[]` as a plain value here;
+    // every other comparison against it goes through `ops`.
+    | Partial<{
+        [K in keyof Selectable<DB[TableName]>]: TableColumnIsArray<Schema, TableName, K> extends true
+          ? Extract<Selectable<DB[TableName]>[K], null> | readonly []
+          : Selectable<DB[TableName]>[K]
+      }>
     | Partial<{
         [ColumnName in keyof DB[TableName]]:
           | NonKyselySupportedSupplementalWhereClauseValues<DB, Schema, TableName, ColumnName>