@zenstackhq/orm 3.5.2 → 3.5.4

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import * as _zenstackhq_schema from '@zenstackhq/schema';
-import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, NonRelationFields, GetModel, ProcedureDef, BuiltinType, FieldDef, ModelDef, DataSourceProviderType, IsDelegateModel, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetEnums, GetEnum, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, GetTypeDefFieldType, TypeDefFieldIsArray, UpdatedAtInfo, FieldIsDelegateDiscriminator, FieldType, RelationInfo, Expression as Expression$1, LiteralExpression, ArrayExpression, FieldExpression, MemberExpression, BinaryExpression, UnaryExpression, CallExpression, BindingExpression, ThisExpression, NullExpression } from '@zenstackhq/schema';
+import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, NonRelationFields, GetModel, ProcedureDef, BuiltinType, FieldDef, ModelDef, DataSourceProviderType, IsDelegateModel, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetEnums, GetEnum, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, GetTypeDefFieldType, TypeDefFieldIsArray, GetModelDiscriminator, GetSubModels, UpdatedAtInfo, FieldIsDelegateDiscriminator, FieldType, RelationInfo, Expression as Expression$1, LiteralExpression, ArrayExpression, FieldExpression, MemberExpression, BinaryExpression, UnaryExpression, CallExpression, BindingExpression, ThisExpression, NullExpression } from '@zenstackhq/schema';
 import * as kysely from 'kysely';
 import { Kysely, OperationNodeVisitor, OperationNode, SelectQueryNode, SelectionNode, ColumnNode, AliasNode, TableNode, FromNode, ReferenceNode, AndNode, OrNode, ValueListNode, ParensNode, JoinNode, RawNode, WhereNode, InsertQueryNode, DeleteQueryNode, ReturningNode, CreateTableNode, AddColumnNode, ColumnDefinitionNode, DropTableNode, OrderByNode, OrderByItemNode, GroupByNode, GroupByItemNode, UpdateQueryNode, ColumnUpdateNode, LimitNode, OffsetNode, OnConflictNode, OnDuplicateKeyNode, CheckConstraintNode, DataTypeNode, SelectAllNode, IdentifierNode, SchemableIdentifierNode, ValueNode, PrimitiveValueListNode, OperatorNode, CreateIndexNode, DropIndexNode, ListNode, PrimaryKeyConstraintNode, UniqueConstraintNode, ReferencesNode, WithNode, CommonTableExpressionNode, CommonTableExpressionNameNode, HavingNode, CreateSchemaNode, DropSchemaNode, AlterTableNode, DropColumnNode, RenameColumnNode, AlterColumnNode, ModifyColumnNode, AddConstraintNode, DropConstraintNode, ForeignKeyConstraintNode, CreateViewNode, DropViewNode, GeneratedNode, DefaultValueNode, OnNode, ValuesNode, SelectModifierNode, CreateTypeNode, DropTypeNode, ExplainNode, DefaultInsertValueNode, AggregateFunctionNode, OverNode, PartitionByNode, PartitionByItemNode, SetOperationNode, BinaryOperationNode, UnaryOperationNode, UsingNode, FunctionNode, CaseNode, WhenNode, JSONReferenceNode, JSONPathNode, JSONPathLegNode, JSONOperatorChainNode, TupleNode, MergeQueryNode, MatchedNode, AddIndexNode, CastNode, FetchNode, TopNode, OutputNode, RenameConstraintNode, RefreshMaterializedViewNode, OrActionNode, CollateNode, Generated, QueryId, RootOperationNode, QueryResult, UnknownRow, Dialect, ExpressionBuilder, Expression, KyselyConfig, OperandExpression, SelectQueryBuilder, SqlBool, AliasableExpression, ExpressionWrapper } from 'kysely';
 import Decimal from 'decimal.js';
@@ -908,6 +908,10 @@ declare abstract class BaseCrudDialect<Schema extends SchemaDef> {
      * Builds a VALUES table and select all fields from it.
      */
     abstract buildValuesTableSelect(fields: FieldDef[], rows: unknown[][]): SelectQueryBuilder<any, any, any>;
+    /**
+     * Builds a binary comparison expression between two operands.
+     */
+    buildComparison(left: Expression<unknown>, _leftFieldDef: FieldDef | undefined, op: string, right: Expression<unknown>, _rightFieldDef: FieldDef | undefined): Expression<SqlBool>;
     /**
      * Builds a JSON path selection expression.
      */
@@ -1099,13 +1103,26 @@ type GetAllFieldsExcludedFilterKinds<FieldsConfig> = '$all' extends keyof Fields
     excludedFilterKinds: readonly (infer EFK)[];
 } ? EFK : never : never;
 
-type DefaultModelResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Omit = undefined, Options extends QueryOptions<Schema> = QueryOptions<Schema>, Optional = false, Array = false> = WrapType<{
-    [Key in NonRelationFields<Schema, Model> as ShouldOmitField<Schema, Model, Options, Key, Omit> extends true ? never : Key]: MapModelFieldType<Schema, Model, Key>;
-}, Optional, Array>;
+type DefaultModelResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Omit = undefined, Options extends QueryOptions<Schema> = QueryOptions<Schema>, Optional = false, Array = false, IsGenericModel = [string] extends [Model] ? true : false> = WrapType<IsGenericModel extends true ? FlatModelResult<Schema, Model, Omit, Options> : IsDelegateModel<Schema, Model> extends true ? DelegateUnionResult<Schema, Model, Options, GetSubModels<Schema, Model>, Omit> : FlatModelResult<Schema, Model, Omit, Options>, Optional, Array>;
 type ShouldOmitField<Schema extends SchemaDef, Model extends GetModels<Schema>, Options extends QueryOptions<Schema>, Field extends GetModelFields<Schema, Model>, Omit> = QueryLevelOmit<Schema, Model, Field, Omit> extends boolean ? QueryLevelOmit<Schema, Model, Field, Omit> : OptionsLevelOmit<Schema, Model, Field, Options> extends boolean ? OptionsLevelOmit<Schema, Model, Field, Options> : SchemaLevelOmit<Schema, Model, Field>;
 type QueryLevelOmit<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends GetModelFields<Schema, Model>, Omit> = Field extends keyof Omit ? (Omit[Field] extends boolean ? Omit[Field] : undefined) : undefined;
 type OptionsLevelOmit<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends GetModelFields<Schema, Model>, Options extends QueryOptions<Schema>> = Uncapitalize<Model> extends keyof Options['omit'] ? Field extends keyof Options['omit'][Uncapitalize<Model>] ? Options['omit'][Uncapitalize<Model>][Field] extends boolean ? Options['omit'][Uncapitalize<Model>][Field] : undefined : undefined : undefined;
 type SchemaLevelOmit<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends GetModelFields<Schema, Model>> = GetModelField<Schema, Model, Field>['omit'] extends true ? true : false;
+type FlatModelResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Omit, Options extends QueryOptions<Schema>> = {
+    [Key in NonRelationFields<Schema, Model> as ShouldOmitField<Schema, Model, Options, Key, Omit> extends true ? never : Key]: MapModelFieldType<Schema, Model, Key>;
+};
+type DelegateUnionResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Options extends QueryOptions<Schema>, SubModel extends GetModels<Schema>, Omit = undefined, Depth extends readonly 0[] = []> = Depth['length'] extends 10 ? SubModel extends string ? FlatModelResult<Schema, SubModel, Omit, Options> & {
+    [K in GetModelDiscriminator<Schema, Model>]: SubModel;
+} : never : SubModel extends string ? IsDelegateModel<Schema, SubModel> extends true ? // sub-model is itself a delegate — recurse into its own sub-models so all
+DelegateUnionResult<Schema, SubModel, Options, GetSubModels<Schema, SubModel>, Omit, [
+    ...Depth,
+    0
+]> & {
+    [K in GetModelDiscriminator<Schema, Model>]: SubModel;
+} : // leaf model — produce a flat scalar result and fix the discriminator
+FlatModelResult<Schema, SubModel, Omit, Options> & {
+    [K in GetModelDiscriminator<Schema, Model>]: SubModel;
+} : never;
 type ModelSelectResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Select, Omit, Options extends QueryOptions<Schema>, ExtResult extends ExtResultBase<Schema> = {}> = {
     [Key in keyof Select as Select[Key] extends false | undefined ? never : Key extends keyof ExtractExtResult<ExtResult, Model & string> ? never : Key extends '_count' ? Select[Key] extends SelectCount<Schema, Model, Options> ? Key : never : Key extends keyof Omit ? Omit[Key] extends true ? never : Key : Key]: Key extends '_count' ? SelectCountResult<Schema, Model, Select[Key]> : Key extends NonRelationFields<Schema, Model> ? MapModelFieldType<Schema, Model, Key> : Key extends RelationFields<Schema, Model> ? ModelResult<Schema, RelationFieldType<Schema, Model, Key>, Select[Key], Options, ModelFieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>, ExtResult> : never;
 };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _zenstackhq_schema from '@zenstackhq/schema';
-import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, NonRelationFields, GetModel, ProcedureDef, BuiltinType, FieldDef, ModelDef, DataSourceProviderType, IsDelegateModel, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetEnums, GetEnum, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, GetTypeDefFieldType, TypeDefFieldIsArray, UpdatedAtInfo, FieldIsDelegateDiscriminator, FieldType, RelationInfo, Expression as Expression$1, LiteralExpression, ArrayExpression, FieldExpression, MemberExpression, BinaryExpression, UnaryExpression, CallExpression, BindingExpression, ThisExpression, NullExpression } from '@zenstackhq/schema';
+import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, NonRelationFields, GetModel, ProcedureDef, BuiltinType, FieldDef, ModelDef, DataSourceProviderType, IsDelegateModel, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetEnums, GetEnum, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, GetTypeDefFieldType, TypeDefFieldIsArray, GetModelDiscriminator, GetSubModels, UpdatedAtInfo, FieldIsDelegateDiscriminator, FieldType, RelationInfo, Expression as Expression$1, LiteralExpression, ArrayExpression, FieldExpression, MemberExpression, BinaryExpression, UnaryExpression, CallExpression, BindingExpression, ThisExpression, NullExpression } from '@zenstackhq/schema';
 import * as kysely from 'kysely';
 import { Kysely, OperationNodeVisitor, OperationNode, SelectQueryNode, SelectionNode, ColumnNode, AliasNode, TableNode, FromNode, ReferenceNode, AndNode, OrNode, ValueListNode, ParensNode, JoinNode, RawNode, WhereNode, InsertQueryNode, DeleteQueryNode, ReturningNode, CreateTableNode, AddColumnNode, ColumnDefinitionNode, DropTableNode, OrderByNode, OrderByItemNode, GroupByNode, GroupByItemNode, UpdateQueryNode, ColumnUpdateNode, LimitNode, OffsetNode, OnConflictNode, OnDuplicateKeyNode, CheckConstraintNode, DataTypeNode, SelectAllNode, IdentifierNode, SchemableIdentifierNode, ValueNode, PrimitiveValueListNode, OperatorNode, CreateIndexNode, DropIndexNode, ListNode, PrimaryKeyConstraintNode, UniqueConstraintNode, ReferencesNode, WithNode, CommonTableExpressionNode, CommonTableExpressionNameNode, HavingNode, CreateSchemaNode, DropSchemaNode, AlterTableNode, DropColumnNode, RenameColumnNode, AlterColumnNode, ModifyColumnNode, AddConstraintNode, DropConstraintNode, ForeignKeyConstraintNode, CreateViewNode, DropViewNode, GeneratedNode, DefaultValueNode, OnNode, ValuesNode, SelectModifierNode, CreateTypeNode, DropTypeNode, ExplainNode, DefaultInsertValueNode, AggregateFunctionNode, OverNode, PartitionByNode, PartitionByItemNode, SetOperationNode, BinaryOperationNode, UnaryOperationNode, UsingNode, FunctionNode, CaseNode, WhenNode, JSONReferenceNode, JSONPathNode, JSONPathLegNode, JSONOperatorChainNode, TupleNode, MergeQueryNode, MatchedNode, AddIndexNode, CastNode, FetchNode, TopNode, OutputNode, RenameConstraintNode, RefreshMaterializedViewNode, OrActionNode, CollateNode, Generated, QueryId, RootOperationNode, QueryResult, UnknownRow, Dialect, ExpressionBuilder, Expression, KyselyConfig, OperandExpression, SelectQueryBuilder, SqlBool, AliasableExpression, ExpressionWrapper } from 'kysely';
 import Decimal from 'decimal.js';
@@ -908,6 +908,10 @@ declare abstract class BaseCrudDialect<Schema extends SchemaDef> {
      * Builds a VALUES table and select all fields from it.
      */
     abstract buildValuesTableSelect(fields: FieldDef[], rows: unknown[][]): SelectQueryBuilder<any, any, any>;
+    /**
+     * Builds a binary comparison expression between two operands.
+     */
+    buildComparison(left: Expression<unknown>, _leftFieldDef: FieldDef | undefined, op: string, right: Expression<unknown>, _rightFieldDef: FieldDef | undefined): Expression<SqlBool>;
     /**
      * Builds a JSON path selection expression.
      */
@@ -1099,13 +1103,26 @@ type GetAllFieldsExcludedFilterKinds<FieldsConfig> = '$all' extends keyof Fields
     excludedFilterKinds: readonly (infer EFK)[];
 } ? EFK : never : never;
 
-type DefaultModelResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Omit = undefined, Options extends QueryOptions<Schema> = QueryOptions<Schema>, Optional = false, Array = false> = WrapType<{
-    [Key in NonRelationFields<Schema, Model> as ShouldOmitField<Schema, Model, Options, Key, Omit> extends true ? never : Key]: MapModelFieldType<Schema, Model, Key>;
-}, Optional, Array>;
+type DefaultModelResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Omit = undefined, Options extends QueryOptions<Schema> = QueryOptions<Schema>, Optional = false, Array = false, IsGenericModel = [string] extends [Model] ? true : false> = WrapType<IsGenericModel extends true ? FlatModelResult<Schema, Model, Omit, Options> : IsDelegateModel<Schema, Model> extends true ? DelegateUnionResult<Schema, Model, Options, GetSubModels<Schema, Model>, Omit> : FlatModelResult<Schema, Model, Omit, Options>, Optional, Array>;
 type ShouldOmitField<Schema extends SchemaDef, Model extends GetModels<Schema>, Options extends QueryOptions<Schema>, Field extends GetModelFields<Schema, Model>, Omit> = QueryLevelOmit<Schema, Model, Field, Omit> extends boolean ? QueryLevelOmit<Schema, Model, Field, Omit> : OptionsLevelOmit<Schema, Model, Field, Options> extends boolean ? OptionsLevelOmit<Schema, Model, Field, Options> : SchemaLevelOmit<Schema, Model, Field>;
 type QueryLevelOmit<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends GetModelFields<Schema, Model>, Omit> = Field extends keyof Omit ? (Omit[Field] extends boolean ? Omit[Field] : undefined) : undefined;
 type OptionsLevelOmit<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends GetModelFields<Schema, Model>, Options extends QueryOptions<Schema>> = Uncapitalize<Model> extends keyof Options['omit'] ? Field extends keyof Options['omit'][Uncapitalize<Model>] ? Options['omit'][Uncapitalize<Model>][Field] extends boolean ? Options['omit'][Uncapitalize<Model>][Field] : undefined : undefined : undefined;
 type SchemaLevelOmit<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends GetModelFields<Schema, Model>> = GetModelField<Schema, Model, Field>['omit'] extends true ? true : false;
+type FlatModelResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Omit, Options extends QueryOptions<Schema>> = {
+    [Key in NonRelationFields<Schema, Model> as ShouldOmitField<Schema, Model, Options, Key, Omit> extends true ? never : Key]: MapModelFieldType<Schema, Model, Key>;
+};
+type DelegateUnionResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Options extends QueryOptions<Schema>, SubModel extends GetModels<Schema>, Omit = undefined, Depth extends readonly 0[] = []> = Depth['length'] extends 10 ? SubModel extends string ? FlatModelResult<Schema, SubModel, Omit, Options> & {
+    [K in GetModelDiscriminator<Schema, Model>]: SubModel;
+} : never : SubModel extends string ? IsDelegateModel<Schema, SubModel> extends true ? // sub-model is itself a delegate — recurse into its own sub-models so all
+DelegateUnionResult<Schema, SubModel, Options, GetSubModels<Schema, SubModel>, Omit, [
+    ...Depth,
+    0
+]> & {
+    [K in GetModelDiscriminator<Schema, Model>]: SubModel;
+} : // leaf model — produce a flat scalar result and fix the discriminator
+FlatModelResult<Schema, SubModel, Omit, Options> & {
+    [K in GetModelDiscriminator<Schema, Model>]: SubModel;
+} : never;
 type ModelSelectResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Select, Omit, Options extends QueryOptions<Schema>, ExtResult extends ExtResultBase<Schema> = {}> = {
     [Key in keyof Select as Select[Key] extends false | undefined ? never : Key extends keyof ExtractExtResult<ExtResult, Model & string> ? never : Key extends '_count' ? Select[Key] extends SelectCount<Schema, Model, Options> ? Key : never : Key extends keyof Omit ? Omit[Key] extends true ? never : Key : Key]: Key extends '_count' ? SelectCountResult<Schema, Model, Select[Key]> : Key extends NonRelationFields<Schema, Model> ? MapModelFieldType<Schema, Model, Key> : Key extends RelationFields<Schema, Model> ? ModelResult<Schema, RelationFieldType<Schema, Model, Key>, Select[Key], Options, ModelFieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>, ExtResult> : never;
 };

package/dist/index.js

@@ -82,6 +82,7 @@ __reExport(schema_exports, schema_star);
 import * as schema_star from "@zenstackhq/schema";
 
 // src/utils/object-utils.ts
+import { isPlainObject } from "@zenstackhq/common-helpers";
 function extractFields(obj, fields) {
   return Object.fromEntries(Object.entries(obj).filter(([key]) => fields.includes(key)));
 }
@@ -93,6 +94,10 @@ function fieldsToSelectObject(fields) {
   ]));
 }
 __name(fieldsToSelectObject, "fieldsToSelectObject");
+function isEmptyObject(x) {
+  return isPlainObject(x) && Object.keys(x).length === 0;
+}
+__name(isEmptyObject, "isEmptyObject");
 
 // src/client/executor/error-processor.ts
 function getDbErrorCode(error) {
@@ -605,7 +610,7 @@ __name(tmpAlias, "tmpAlias");
 
 // src/client/crud/operations/base.ts
 import { createId as cuid2 } from "@paralleldrive/cuid2";
-import { clone, enumerate as enumerate2, invariant as invariant7, isPlainObject as isPlainObject2 } from "@zenstackhq/common-helpers";
+import { clone, enumerate as enumerate2, invariant as invariant7, isPlainObject as isPlainObject3 } from "@zenstackhq/common-helpers";
 import { default as cuid1 } from "cuid";
 import { createQueryId, expressionBuilder as expressionBuilder5, sql as sql5 } from "kysely";
 import { nanoid } from "nanoid";
@@ -729,7 +734,7 @@ var AnyNull = new AnyNullClass();
 import { invariant as invariant3 } from "@zenstackhq/common-helpers";
 
 // src/client/crud/dialects/base-dialect.ts
-import { enumerate, invariant as invariant2, isPlainObject, lowerCaseFirst } from "@zenstackhq/common-helpers";
+import { enumerate, invariant as invariant2, isPlainObject as isPlainObject2, lowerCaseFirst } from "@zenstackhq/common-helpers";
 import { expressionBuilder, sql } from "kysely";
 import { match as match2, P } from "ts-pattern";
 var BaseCrudDialect = class {
@@ -857,7 +862,31 @@ var BaseCrudDialect = class {
     return LOGICAL_COMBINATORS.includes(key);
   }
   buildCompositeFilter(model, modelAlias, key, payload) {
-    return match2(key).with("AND", () => this.and(...enumerate(payload).map((subPayload) => this.buildFilter(model, modelAlias, subPayload)))).with("OR", () => this.or(...enumerate(payload).map((subPayload) => this.buildFilter(model, modelAlias, subPayload)))).with("NOT", () => this.eb.not(this.buildCompositeFilter(model, modelAlias, "AND", payload))).exhaustive();
+    const normalizedPayload = enumerate(payload).filter((el) => {
+      if (typeof el === "object" && el !== null && !Array.isArray(el)) {
+        const entries = Object.entries(el);
+        return entries.some(([, v]) => v !== void 0);
+      } else {
+        return true;
+      }
+    });
+    const normalizedFilters = normalizedPayload.map((el) => this.buildFilter(model, modelAlias, el));
+    return match2(key).with("AND", () => {
+      if (normalizedFilters.length === 0) {
+        return this.true();
+      }
+      return this.and(...normalizedFilters);
+    }).with("OR", () => {
+      if (normalizedFilters.length === 0) {
+        return this.false();
+      }
+      return this.or(...normalizedFilters);
+    }).with("NOT", () => {
+      if (normalizedFilters.length === 0) {
+        return this.true();
+      }
+      return this.not(...normalizedFilters);
+    }).exhaustive();
   }
   buildRelationFilter(model, modelAlias, field, fieldDef, payload) {
     if (!fieldDef.array) {
@@ -1198,7 +1227,7 @@ var BaseCrudDialect = class {
     return this.eb(lhs, "=", this.transformInput(rhs, type, false));
   }
   buildStandardFilter(type, payload, lhs, getRhs, recurse, throwIfInvalid = false, onlyForKeys = void 0, excludeKeys = []) {
-    if (payload === null || !isPlainObject(payload)) {
+    if (payload === null || !isPlainObject2(payload)) {
       return {
         conditions: [
           this.buildValueFilter(lhs, type, payload)
@@ -1215,6 +1244,9 @@ var BaseCrudDialect = class {
       if (excludeKeys.includes(op)) {
         continue;
       }
+      if (value === void 0) {
+        continue;
+      }
       const rhs = Array.isArray(value) ? value.map(getRhs) : getRhs(value);
       const condition = match2(op).with("equals", () => rhs === null ? this.eb(lhs, "is", null) : this.eb(lhs, "=", rhs)).with("in", () => {
         invariant2(Array.isArray(rhs), "right hand side must be an array");
@@ -1272,6 +1304,9 @@ var BaseCrudDialect = class {
         if (key === "mode" || consumedKeys.includes(key)) {
           continue;
         }
+        if (value === void 0) {
+          continue;
+        }
         invariant2(typeof value === "string", `${key} value must be a string`);
         const escapedValue = this.escapeLikePattern(value);
         const condition = match2(key).with("contains", () => this.buildStringLike(fieldRef, `%${escapedValue}%`, mode === "insensitive")).with("startsWith", () => this.buildStringLike(fieldRef, `${escapedValue}%`, mode === "insensitive")).with("endsWith", () => this.buildStringLike(fieldRef, `%${escapedValue}`, mode === "insensitive")).otherwise(() => {
@@ -1597,6 +1632,12 @@ var BaseCrudDialect = class {
   buildExistsExpression(innerQuery) {
     return this.eb.exists(innerQuery);
   }
+  /**
+   * Builds a binary comparison expression between two operands.
+   */
+  buildComparison(left, _leftFieldDef, op, right, _rightFieldDef) {
+    return this.eb(left, op, right);
+  }
 };
 
 // src/client/crud/dialects/lateral-join-dialect-base.ts
@@ -2031,6 +2072,33 @@ var PostgresCrudDialect = class _PostgresCrudDialect extends LateralJoinDialectB
     Bytes: "bytea",
     Json: "jsonb"
   };
+  // Maps @db.* attribute names to PostgreSQL SQL types for use in VALUES table casts
+  static dbAttributeToSqlTypeMap = {
+    "@db.Uuid": "uuid",
+    "@db.Citext": "citext",
+    "@db.Inet": "inet",
+    "@db.Bit": "bit",
+    "@db.VarBit": "varbit",
+    "@db.Xml": "xml",
+    "@db.Json": "json",
+    "@db.JsonB": "jsonb",
+    "@db.ByteA": "bytea",
+    "@db.Text": "text",
+    "@db.Char": "bpchar",
+    "@db.VarChar": "varchar",
+    "@db.Date": "date",
+    "@db.Time": "time",
+    "@db.Timetz": "timetz",
+    "@db.Timestamp": "timestamp",
+    "@db.Timestamptz": "timestamptz",
+    "@db.SmallInt": "smallint",
+    "@db.Integer": "integer",
+    "@db.BigInt": "bigint",
+    "@db.Real": "real",
+    "@db.DoublePrecision": "double precision",
+    "@db.Decimal": "decimal",
+    "@db.Boolean": "boolean"
+  };
   constructor(schema, options) {
     super(schema, options);
     this.overrideTypeParsers();
@@ -2295,13 +2363,55 @@ var PostgresCrudDialect = class _PostgresCrudDialect extends LateralJoinDialectB
       receiver
     ]).as("$items")).select(this.eb.lit(1).as("_")).where(buildFilter(this.eb.ref("$items.value"))));
   }
-  getSqlType(zmodelType) {
+  getSqlType(zmodelType, attributes) {
+    if (attributes) {
+      for (const attr of attributes) {
+        const mapped = _PostgresCrudDialect.dbAttributeToSqlTypeMap[attr.name];
+        if (mapped) {
+          return mapped;
+        }
+      }
+    }
     if (isEnum(this.schema, zmodelType)) {
       return "text";
     } else {
       return this.zmodelToSqlTypeMap[zmodelType] ?? "text";
     }
   }
+  // Resolves the effective SQL type for a field: the native type from any @db.* attribute,
+  // or the base ZModel SQL type if no attribute is present, or undefined if the field is unknown.
+  resolveFieldSqlType(fieldDef) {
+    if (!fieldDef) {
+      return {
+        sqlType: void 0,
+        hasDbOverride: false
+      };
+    }
+    const dbAttr = fieldDef.attributes?.find((a) => a.name.startsWith("@db."));
+    if (dbAttr) {
+      return {
+        sqlType: _PostgresCrudDialect.dbAttributeToSqlTypeMap[dbAttr.name],
+        hasDbOverride: true
+      };
+    }
+    return {
+      sqlType: this.getSqlType(fieldDef.type),
+      hasDbOverride: false
+    };
+  }
+  buildComparison(left, leftFieldDef, op, right, rightFieldDef) {
+    const leftResolved = this.resolveFieldSqlType(leftFieldDef);
+    const rightResolved = this.resolveFieldSqlType(rightFieldDef);
+    if (leftResolved.sqlType !== rightResolved.sqlType && (leftResolved.hasDbOverride || rightResolved.hasDbOverride)) {
+      if (leftResolved.hasDbOverride) {
+        left = this.eb.cast(left, sql3.raw(this.getSqlType(leftFieldDef.type)));
+      }
+      if (rightResolved.hasDbOverride) {
+        right = this.eb.cast(right, sql3.raw(this.getSqlType(rightFieldDef.type)));
+      }
+    }
+    return super.buildComparison(left, leftFieldDef, op, right, rightFieldDef);
+  }
   getStringCasingBehavior() {
     return {
       supportsILike: true,
@@ -2323,7 +2433,7 @@ var PostgresCrudDialect = class _PostgresCrudDialect extends LateralJoinDialectB
     }
     const eb = expressionBuilder3();
     return eb.selectFrom(sql3`(VALUES ${sql3.join(rows.map((row) => sql3`(${sql3.join(row.map((v) => sql3.val(v)))})`), sql3.raw(", "))})`.as("$values")).select(fields.map((f, i) => {
-      const mappedType = this.getSqlType(f.type);
+      const mappedType = this.getSqlType(f.type, f.attributes);
       const castType = f.array ? sql3`${sql3.raw(mappedType)}[]` : sql3.raw(mappedType);
       return this.eb.cast(sql3.ref(`$values.column${i + 1}`), castType).as(f.name);
     }));
@@ -3351,7 +3461,7 @@ var BaseOperationHandler = class {
       throw createInvalidInputError("data must be an object");
     }
     const parentWhere = await this.buildUpdateParentRelationFilter(kysely, fromRelation);
-    let combinedWhere = where ?? {};
+    let combinedWhere = where ?? true;
     if (Object.keys(parentWhere).length > 0) {
       combinedWhere = Object.keys(combinedWhere).length > 0 ? {
         AND: [
@@ -3624,7 +3734,7 @@ var BaseOperationHandler = class {
       throw createNotSupportedError("Updating with a limit is not supported for polymorphic models");
     }
     const parentWhere = await this.buildUpdateParentRelationFilter(kysely, fromRelation);
-    let combinedWhere = where ?? {};
+    let combinedWhere = where ?? true;
     if (Object.keys(parentWhere).length > 0) {
       combinedWhere = Object.keys(combinedWhere).length > 0 ? {
         AND: [
@@ -3816,11 +3926,11 @@ var BaseOperationHandler = class {
           break;
         }
         case "delete": {
-          await this.deleteRelation(kysely, fieldModel, value, fromRelationContext, true);
+          await this.deleteRelation(kysely, fieldModel, value, fromRelationContext, true, true);
           break;
         }
         case "deleteMany": {
-          await this.deleteRelation(kysely, fieldModel, value, fromRelationContext, false);
+          await this.deleteRelation(kysely, fieldModel, value, fromRelationContext, false, false);
           break;
         }
         default: {
@@ -3908,6 +4018,10 @@ var BaseOperationHandler = class {
           true
         ];
       }
+    } else if (isEmptyObject(data)) {
+      disconnectConditions = [
+        true
+      ];
     } else {
       disconnectConditions = this.normalizeRelationManipulationInput(model, data);
       if (disconnectConditions.length === 0) {
@@ -4030,9 +4144,9 @@ var BaseOperationHandler = class {
       }
     }
   }
-  async deleteRelation(kysely, model, data, fromRelation, throwForNotFound) {
+  async deleteRelation(kysely, model, data, fromRelation, uniqueDelete, throwForNotFound) {
     let deleteConditions = [];
-    let expectedDeleteCount;
+    let expectedDeleteCount = -1;
     if (typeof data === "boolean") {
       if (data === false) {
         return;
@@ -4040,6 +4154,15 @@ var BaseOperationHandler = class {
         deleteConditions = [
           true
         ];
+        if (uniqueDelete) {
+          expectedDeleteCount = 1;
+        }
+      }
+    } else if (isEmptyObject(data)) {
+      deleteConditions = [
+        true
+      ];
+      if (uniqueDelete) {
         expectedDeleteCount = 1;
       }
     } else {
@@ -4047,7 +4170,9 @@ var BaseOperationHandler = class {
       if (deleteConditions.length === 0) {
         return;
       }
-      expectedDeleteCount = deleteConditions.length;
+      if (uniqueDelete) {
+        expectedDeleteCount = deleteConditions.length;
+      }
     }
     let deleteResult;
     let deleteFromModel;
@@ -4107,7 +4232,7 @@ var BaseOperationHandler = class {
         });
       }
     }
-    if (throwForNotFound && expectedDeleteCount > (deleteResult.numAffectedRows ?? 0)) {
+    if (throwForNotFound && expectedDeleteCount >= 0 && expectedDeleteCount > (deleteResult.numAffectedRows ?? 0)) {
       throw createNotFoundError(deleteFromModel);
     }
   }
@@ -4242,7 +4367,7 @@ var BaseOperationHandler = class {
       for (const [key, value] of Object.entries(args)) {
         if (value === void 0) {
           delete args[key];
-        } else if (value && isPlainObject2(value)) {
+        } else if (value && isPlainObject3(value)) {
           this.doNormalizeArgs(value);
         }
       }