@avytrix/nestjs-drizzle-crud 3.5.1 → 3.6.0

package/dist/core/abstract/sql-base-crud.service.js

@@ -196,6 +196,18 @@ class SqlBaseCrudService {
             return [];
         return Object.entries(values).map(([key, value]) => value === null ? (0, drizzle_orm_1.isNull)(table[key]) : (0, drizzle_orm_1.eq)(table[key], value));
     }
+    relatedRowScope(target, options) {
+        const out = this.relatedScopeConditions(target, options);
+        const softDeleted = this.softDeleteCondition(target);
+        if (softDeleted)
+            out.push(softDeleted);
+        return out;
+    }
+    relatedScopeConditions(target, options) {
+        return Object.entries(this.resolveScope(options) ?? {})
+            .filter(([key]) => this.columnOf(target, key))
+            .map(([key, value]) => value === null ? (0, drizzle_orm_1.isNull)(target[key]) : (0, drizzle_orm_1.eq)(target[key], value));
+    }
     applyScopeToRow(row, options) {
         const values = this.resolveScope(options);
         if (values)
@@ -497,7 +509,7 @@ class SqlBaseCrudService {
         }
         return Object.keys(fields).length > 0 ? fields : undefined;
     }
-    async loadRelations(db, hosts, nodes, select = { base: [], relations: {} }, hostTable = this.config.table) {
+    async loadRelations(db, hosts, nodes, select = { base: [], relations: {} }, hostTable = this.config.table, options) {
         if (!nodes.length || !Array.isArray(hosts))
             return;
         const rows = hosts.filter((row) => row && typeof row === "object");
@@ -508,13 +520,13 @@ class SqlBaseCrudService {
             if (!node.joined) {
                 switch (this.relationType(node.config)) {
                     case "hasMany":
-                        await this.loadHasMany(db, rows, node, childSelect, hostTable);
+                        await this.loadHasMany(db, rows, node, childSelect, hostTable, options);
                         break;
                     case "manyToMany":
-                        await this.loadManyToMany(db, rows, node, childSelect, hostTable);
+                        await this.loadManyToMany(db, rows, node, childSelect, hostTable, options);
                         break;
                     default:
-                        await this.loadBelongsTo(db, rows, node, childSelect);
+                        await this.loadBelongsTo(db, rows, node, childSelect, options);
                 }
             }
             if (node.children.length === 0)
@@ -522,10 +534,10 @@ class SqlBaseCrudService {
             const nextHosts = this.isCollection(node.config)
                 ? rows.flatMap((row) => row[node.name] ?? [])
                 : rows.map((row) => row[node.name]);
-            await this.loadRelations(db, nextHosts, node.children, childSelect, node.config.table);
+            await this.loadRelations(db, nextHosts, node.children, childSelect, node.config.table, options);
         }));
     }
-    async loadBelongsTo(db, hosts, node, select) {
+    async loadBelongsTo(db, hosts, node, select, options) {
         const { localKey, references } = node.config;
         if (!localKey)
             return;
@@ -545,9 +557,7 @@ class SqlBaseCrudService {
             ...this.keysForChildren(node.children, target),
         ]);
         const conditions = [(0, drizzle_orm_1.inArray)(referenced, ids)];
-        const softDeleted = this.softDeleteCondition(target);
-        if (softDeleted)
-            conditions.push(softDeleted);
+        conditions.push(...this.relatedRowScope(target, options));
         const related = await (fields ? db.select(fields) : db.select())
             .from(target)
             .where((0, drizzle_orm_1.and)(...conditions));
@@ -558,7 +568,7 @@ class SqlBaseCrudService {
             host[node.name] = byKey.get(host[localKey]) ?? null;
         }
     }
-    async loadHasMany(db, hosts, node, select, hostTable = this.config.table) {
+    async loadHasMany(db, hosts, node, select, hostTable = this.config.table, options) {
         const { foreignKey } = node.config;
         if (!foreignKey)
             return;
@@ -578,9 +588,7 @@ class SqlBaseCrudService {
             ...this.keysForChildren(node.children, target),
         ]);
         const conditions = [(0, drizzle_orm_1.inArray)(foreign, ids)];
-        const softDeleted = this.softDeleteCondition(target);
-        if (softDeleted)
-            conditions.push(softDeleted);
+        conditions.push(...this.relatedRowScope(target, options));
         let query = (fields ? db.select(fields) : db.select())
             .from(target)
             .where((0, drizzle_orm_1.and)(...conditions));
@@ -590,7 +598,7 @@ class SqlBaseCrudService {
         const children = await query;
         this.groupCollection(hosts, node.name, parentKey, children, foreignKey);
     }
-    async loadManyToMany(db, hosts, node, select, hostTable = this.config.table) {
+    async loadManyToMany(db, hosts, node, select, hostTable = this.config.table, options) {
         const { through, throughLocalKey, throughForeignKey, references } = node.config;
         if (!through || !throughLocalKey || !throughForeignKey)
             return;
@@ -618,9 +626,7 @@ class SqlBaseCrudService {
                 fields[name] = columns[name];
         }
         const conditions = [(0, drizzle_orm_1.inArray)(joinLocal, ids)];
-        const softDeleted = this.softDeleteCondition(target);
-        if (softDeleted)
-            conditions.push(softDeleted);
+        conditions.push(...this.relatedRowScope(target, options));
         let query = db
             .select(fields)
             .from(through)
@@ -650,7 +656,7 @@ class SqlBaseCrudService {
             host[name] = grouped.get(host[parentKey]) ?? [];
         }
     }
-    applyJoins(query, relationNames) {
+    applyJoins(query, relationNames, options) {
         const configured = this.config.relations || {};
         let q = query;
         for (const name of relationNames) {
@@ -658,8 +664,7 @@ class SqlBaseCrudService {
             if (!rel?.localKey || this.isCollection(rel))
                 continue;
             const on = (0, drizzle_orm_1.eq)(this.config.table[rel.localKey], rel.table[rel.references ?? "id"]);
-            const softDeleted = this.softDeleteCondition(rel.table);
-            q = q.leftJoin(rel.table, softDeleted ? (0, drizzle_orm_1.and)(on, softDeleted) : on);
+            q = q.leftJoin(rel.table, (0, drizzle_orm_1.and)(on, ...this.relatedRowScope(rel.table, options)));
         }
         return q;
     }
@@ -681,13 +686,13 @@ class SqlBaseCrudService {
             return out;
         });
     }
-    buildOrderBy(sortBy, sortOrder = "desc") {
+    buildOrderBy(sortBy, sortOrder = "asc") {
         return this.resolveSort(sortBy, sortOrder).map((spec) => this.orderOf(spec));
     }
     orderOf(spec) {
         return spec.order === "desc" ? (0, drizzle_orm_1.desc)(spec.column) : (0, drizzle_orm_1.asc)(spec.column);
     }
-    resolveSort(sortBy, sortOrder = "desc", options) {
+    resolveSort(sortBy, sortOrder = "asc", options) {
         if (sortOrder !== "asc" && sortOrder !== "desc") {
             throw new common_1.BadRequestException(`Invalid sortOrder: ${sortOrder} (expected 'asc' or 'desc')`);
         }
@@ -800,14 +805,18 @@ class SqlBaseCrudService {
     }
     isUniqueViolation(error) {
         const code = error?.code ?? error?.cause?.code;
-        return code === "23505";
+        const errno = error?.errno ?? error?.cause?.errno;
+        return code === "23505" || code === "ER_DUP_ENTRY" || errno === 1062;
     }
     toDuplicateException(error) {
         const detail = error?.detail ?? error?.cause?.detail ?? "";
-        const m = detail.match(/Key \((?<field>.+?)\)=\((?<value>.+?)\)/);
+        const message = error?.cause?.message ?? error?.message ?? "";
+        const m = detail.match(/Key \((?<field>.+?)\)=\((?<value>.+?)\)/) ??
+            message.match(/Duplicate entry '(?<value>.*)' for key '(?:[^']*\.)?(?<field>[^']+)'/);
         return new crud_exceptions_1.DuplicateEntityException(this.getEntityName(), m?.groups?.field ?? "unique field", m?.groups?.value ?? "");
     }
     static DATA_ERRORS = {
+        "23502": "a required value is missing",
         "22001": "a value is too long for its column",
         "23514": "a value violates a column check constraint",
         "22003": "a numeric value is out of range",
@@ -822,7 +831,13 @@ class SqlBaseCrudService {
     }
     toDataException(error) {
         const code = error?.code ?? error?.cause?.code;
-        return new crud_exceptions_1.ValidationFailedException(SqlBaseCrudService.DATA_ERRORS[code] ?? "invalid value");
+        const message = SqlBaseCrudService.DATA_ERRORS[code] ?? "invalid value";
+        const cause = error?.cause ?? error;
+        const column = error?.column ??
+            cause?.column ??
+            error?.column_name ??
+            cause?.column_name;
+        return new crud_exceptions_1.ValidationFailedException(column ? `${message}: ${column}` : message);
     }
     toClientError(error, operation = "write") {
         if (this.isUniqueViolation(error))
@@ -846,7 +861,8 @@ class SqlBaseCrudService {
     }
     isForeignKeyViolation(error) {
         const code = error?.code ?? error?.cause?.code;
-        return code === "23503";
+        const errno = error?.errno ?? error?.cause?.errno;
+        return code === "23503" || errno === 1451 || errno === 1452;
     }
     toForeignKeyException(error) {
         const detail = error?.detail ?? error?.cause?.detail ?? "";
@@ -876,7 +892,7 @@ class SqlBaseCrudService {
             return undefined;
         if (search.mode === "fullText") {
             if (this.config.dialect !== "postgresql") {
-                throw new Error("Full-text search only supported in PostgreSQL");
+                throw new common_1.BadRequestException("Full-text search only supported in PostgreSQL");
             }
             const tsVector = drizzle_orm_1.sql.join(columns.map((column) => (0, drizzle_orm_1.sql) `to_tsvector('english', ${column})`), (0, drizzle_orm_1.sql) ` || `);
             const tsQuery = (0, drizzle_orm_1.sql) `plainto_tsquery('english', ${term})`;
@@ -1008,14 +1024,14 @@ class SqlBaseCrudService {
         const baseSelect = this.withCountKeys(this.withRequiredKeys(selection.base, nodes), options?.counts);
         conditions.push(...this.rowScope(options));
         let query = this.startSelect(db, baseSelect, joined, false, selection);
-        query = this.applyJoins(query, joined.map((node) => node.name))
+        query = this.applyJoins(query, joined.map((node) => node.name), options)
             .where((0, drizzle_orm_1.and)(...conditions))
             .limit(1);
         query = this.applyLock(query, options);
         const result = await this.runRead(query);
         const rows = this.normalizeRelations(result, joined.map((node) => node.name));
         await Promise.all([
-            this.loadRelations(db, rows, nodes, selection),
+            this.loadRelations(db, rows, nodes, selection, undefined, options),
             this.loadCounts(db, rows, options?.counts, options),
         ]);
         return rows[0] || null;
@@ -1055,22 +1071,22 @@ class SqlBaseCrudService {
         built.conditions.push(...this.rowScope(options));
         return built;
     }
-    buildCountQuery(db, conditions, filterRelations) {
+    buildCountQuery(db, conditions, filterRelations, options) {
         let query = db
             .select({ count: (0, drizzle_orm_1.sql) `count(*)` })
             .from(this.config.table);
-        query = this.applyJoins(query, filterRelations);
+        query = this.applyJoins(query, filterRelations, options);
         if (conditions.length > 0)
             query = query.where((0, drizzle_orm_1.and)(...conditions));
         return query;
     }
     async findAll(filters, pagination, options) {
-        const { sortBy, sortOrder = "desc" } = pagination || {};
+        const { sortBy, sortOrder = "asc" } = pagination || {};
         const withCount = pagination?.withCount !== false;
         const { page, limit: safeLimit, offset, } = this.resolvePagination(pagination?.page, pagination?.limit);
         const plan = this.planList(filters, sortBy, sortOrder, options);
         let dataQuery = this.startSelect(plan.db, plan.baseSelect, plan.joined, plan.joinRelations.length > 0, plan.selection);
-        dataQuery = this.applyJoins(dataQuery, plan.joinRelations);
+        dataQuery = this.applyJoins(dataQuery, plan.joinRelations, options);
         if (plan.conditions.length > 0) {
             dataQuery = dataQuery.where((0, drizzle_orm_1.and)(...plan.conditions));
         }
@@ -1082,13 +1098,13 @@ class SqlBaseCrudService {
             .offset(offset);
         dataQuery = this.applyLock(dataQuery, options);
         const countQuery = withCount
-            ? this.buildCountQuery(plan.db, plan.conditions, plan.filterRelations)
+            ? this.buildCountQuery(plan.db, plan.conditions, plan.filterRelations, options)
             : Promise.resolve(undefined);
         const [fetched, totalResult] = await this.runRead(Promise.all([dataQuery, countQuery]));
         const data = fetched.slice(0, safeLimit);
         const rows = this.normalizeRelations(data, plan.joined.map((node) => node.name));
         await Promise.all([
-            this.loadRelations(plan.db, rows, plan.nodes, plan.selection),
+            this.loadRelations(plan.db, rows, plan.nodes, plan.selection, undefined, options),
             this.loadCounts(plan.db, rows, options?.counts, options),
         ]);
         if (!withCount) {
@@ -1108,7 +1124,7 @@ class SqlBaseCrudService {
         };
     }
     async findByCursor(filters, pagination, options) {
-        const { sortBy, sortOrder = "desc", count = false } = pagination || {};
+        const { sortBy, sortOrder = "asc", count = false } = pagination || {};
         const { limit } = this.resolvePagination(1, pagination?.limit);
         const plan = this.planList(filters, sortBy, sortOrder, options);
         const signature = plan.sort
@@ -1128,7 +1144,7 @@ class SqlBaseCrudService {
             fields[`${CURSOR_KEY}${i}`] = this.cursorField(spec.column);
         });
         let dataQuery = plan.db.select(fields).from(this.config.table);
-        dataQuery = this.applyJoins(dataQuery, plan.joinRelations);
+        dataQuery = this.applyJoins(dataQuery, plan.joinRelations, options);
         if (conditions.length > 0)
             dataQuery = dataQuery.where((0, drizzle_orm_1.and)(...conditions));
         dataQuery = dataQuery
@@ -1138,7 +1154,7 @@ class SqlBaseCrudService {
         const [data, totalResult] = await this.runRead(Promise.all([
             dataQuery,
             count
-                ? this.buildCountQuery(plan.db, plan.conditions, plan.filterRelations)
+                ? this.buildCountQuery(plan.db, plan.conditions, plan.filterRelations, options)
                 : Promise.resolve(undefined),
         ]));
         const page = data.slice(0, limit);
@@ -1153,7 +1169,7 @@ class SqlBaseCrudService {
         }
         const rows = this.normalizeRelations(page, plan.joined.map((node) => node.name));
         await Promise.all([
-            this.loadRelations(plan.db, rows, plan.nodes, plan.selection),
+            this.loadRelations(plan.db, rows, plan.nodes, plan.selection, undefined, options),
             this.loadCounts(plan.db, rows, options?.counts, options),
         ]);
         const out = { data: rows, limit, nextCursor };
@@ -1229,7 +1245,7 @@ class SqlBaseCrudService {
         }
         const hosts = rows.filter(Boolean);
         await Promise.all([
-            this.loadRelations(db, hosts, nodes),
+            this.loadRelations(db, hosts, nodes, undefined, undefined, options),
             this.loadCounts(db, hosts, options?.counts, options),
         ]);
     }
@@ -1391,8 +1407,13 @@ class SqlBaseCrudService {
     relatedRow(table, value, options) {
         const out = {};
         for (const [key, item] of Object.entries(value)) {
-            if (item !== undefined && this.columnOf(table, key))
-                out[key] = item;
+            const column = this.columnOf(table, key);
+            if (item === undefined ||
+                !column ||
+                (column.primary && column.hasDefault)) {
+                continue;
+            }
+            out[key] = item;
         }
         const softDelete = this.config.softDelete;
         if (softDelete?.enabled)
@@ -1421,14 +1442,7 @@ class SqlBaseCrudService {
         const local = through[relation.throughLocalKey];
         const foreign = through[relation.throughForeignKey];
         const conditions = [(0, drizzle_orm_1.inArray)(referenced, wanted)];
-        const softDeleted = this.softDeleteCondition(target);
-        if (softDeleted)
-            conditions.push(softDeleted);
-        for (const [key, value] of Object.entries(this.resolveScope(options) ?? {})) {
-            if (!this.columnOf(target, key))
-                continue;
-            conditions.push(value === null ? (0, drizzle_orm_1.isNull)(target[key]) : (0, drizzle_orm_1.eq)(target[key], value));
-        }
+        conditions.push(...this.relatedRowScope(target, options));
         const found = await tx
             .select({ id: referenced })
             .from(target)
@@ -1636,7 +1650,7 @@ class SqlBaseCrudService {
     }
     async softDelete(id, options) {
         if (!this.config.softDelete?.enabled) {
-            throw new Error("Soft delete is not enabled for this entity");
+            throw new common_1.BadRequestException("Soft delete is not enabled for this entity");
         }
         const { transaction, hooks = {} } = options || {};
         const existing = await this.findForGuard(id, {
@@ -1678,18 +1692,16 @@ class SqlBaseCrudService {
     }
     async restore(id, options) {
         if (!this.config.softDelete?.enabled) {
-            throw new Error("Soft delete is not enabled for this entity");
+            throw new common_1.BadRequestException("Soft delete is not enabled for this entity");
         }
         const { transaction, hooks = {} } = options || {};
-        if (options?.expectedVersion != null && this.config.versionColumn) {
-            const existing = await this.findForGuard(id, {
-                ...options,
-                withDeleted: true,
-                onlyDeleted: false,
-            });
-            if (!existing)
-                throw new crud_exceptions_1.EntityNotFoundException(this.getEntityName(), id);
-        }
+        const existing = await this.findForGuard(id, {
+            ...options,
+            withDeleted: false,
+            onlyDeleted: true,
+        });
+        if (!existing)
+            throw new crud_exceptions_1.EntityNotFoundException(this.getEntityName(), id);
         if (!hooks.skipBefore)
             await this.beforeRestore(id);
         await this.emitEvent("before", "restore", false, { ids: [id], transaction }, options);
@@ -1769,6 +1781,7 @@ class SqlBaseCrudService {
     }
     async massUpsert(data, upsert = {}, options) {
         this.checkReadOptions(options);
+        this.assertBatchSize(this.insertParameters(data));
         const message = "Mass upsert errors";
         return this.executeSqlTransaction(async (tx) => {
             const opts = { ...options, transaction: tx };
@@ -1873,21 +1886,25 @@ class SqlBaseCrudService {
             statement = insert.onDuplicateKeyUpdate({ set });
         }
         else {
-            const scoped = this.scopeConditions(options);
+            const guard = [
+                ...this.scopeConditions(options),
+                ...[this.softDeleteCondition(table)].filter(Boolean),
+            ];
             statement = insert.onConflictDoUpdate({
                 target: targets.length === 1 ? targets[0] : targets,
                 set,
-                ...(scoped.length > 0 && { where: (0, drizzle_orm_1.and)(...scoped) }),
+                ...(guard.length > 0 && { where: (0, drizzle_orm_1.and)(...guard) }),
             });
         }
         if (!readBack)
             return statement.returning();
         await statement;
         const match = rows.map((row) => (0, drizzle_orm_1.and)(...targetKeys.map((key, i) => (0, drizzle_orm_1.eq)(targets[i], row[key]))));
+        const softDeleted = this.softDeleteCondition(table);
         return db
             .select()
             .from(table)
-            .where(match.length === 1 ? match[0] : (0, drizzle_orm_1.or)(...match));
+            .where((0, drizzle_orm_1.and)(match.length === 1 ? match[0] : (0, drizzle_orm_1.or)(...match), ...this.scopeConditions(options), ...(softDeleted ? [softDeleted] : [])));
     }
     excludedValue(column) {
         return this.config.dialect === "mysql"
@@ -1899,6 +1916,7 @@ class SqlBaseCrudService {
             return this.massCreatePerItem(data, options);
         }
         this.checkReadOptions(options);
+        this.assertBatchSize(this.insertParameters(data));
         return this.executeSqlTransaction(async (tx) => {
             const opts = { ...options, transaction: tx };
             const rows = await this.eachItem(data.map((item, index) => ({
@@ -1957,6 +1975,7 @@ class SqlBaseCrudService {
         if (options?.bulkMode === "perItem") {
             return this.massUpdatePerItem(ids, data, options);
         }
+        this.assertBatchSize(Array.isArray(ids) ? ids.length : 0);
         this.checkReadOptions(options);
         const message = "Mass update errors";
         return this.executeSqlTransaction(async (tx) => {
@@ -2020,10 +2039,11 @@ class SqlBaseCrudService {
     }
     async massSoftDelete(ids, options) {
         if (!this.config.softDelete?.enabled)
-            throw new Error("Soft delete not enabled");
+            throw new common_1.BadRequestException("Soft delete not enabled");
         if (options?.bulkMode === "perItem") {
             return this.massSoftDeletePerItem(ids, options);
         }
+        this.assertBatchSize(Array.isArray(ids) ? ids.length : 0);
         const message = "Mass soft delete errors";
         return this.executeSqlTransaction(async (tx) => {
             const opts = {
@@ -2063,10 +2083,11 @@ class SqlBaseCrudService {
     }
     async massRestore(ids, options) {
         if (!this.config.softDelete?.enabled)
-            throw new Error("Soft delete not enabled");
+            throw new common_1.BadRequestException("Soft delete not enabled");
         if (options?.bulkMode === "perItem") {
             return this.massRestorePerItem(ids, options);
         }
+        this.assertBatchSize(Array.isArray(ids) ? ids.length : 0);
         this.checkReadOptions(options);
         const message = "Mass restore errors";
         return this.executeSqlTransaction(async (tx) => {
@@ -2104,6 +2125,7 @@ class SqlBaseCrudService {
         if (options?.bulkMode === "perItem") {
             return this.massDeletePerItem(ids, options);
         }
+        this.assertBatchSize(Array.isArray(ids) ? ids.length : 0);
         const message = "Mass delete errors";
         return this.executeSqlTransaction(async (tx) => {
             const opts = { ...options, transaction: tx };
@@ -2295,7 +2317,7 @@ class SqlBaseCrudService {
         this.checkReadOptions(options);
         const db = options?.transaction || this.config.db;
         const { conditions, relations: filterRelations } = this.listConditions(filters, db, options);
-        const result = await this.runRead(this.buildCountQuery(db, conditions, filterRelations));
+        const result = await this.runRead(this.buildCountQuery(db, conditions, filterRelations, options));
         return parseInt(result[0]?.count?.toString() || "0", 10);
     }
     async countBy(column, filters, options) {
@@ -2308,7 +2330,7 @@ class SqlBaseCrudService {
         let query = db
             .select({ value: spec.column, count: total })
             .from(this.config.table);
-        query = this.applyJoins(query, joins);
+        query = this.applyJoins(query, joins, options);
         if (conditions.length > 0)
             query = query.where((0, drizzle_orm_1.and)(...conditions));
         query = query.groupBy(spec.column).orderBy((0, drizzle_orm_1.desc)(total), (0, drizzle_orm_1.asc)(spec.column));
@@ -2418,9 +2440,7 @@ class SqlBaseCrudService {
                 root: false,
             }, filter, db, new Set(), options));
         }
-        const softDeleted = this.softDeleteCondition(target);
-        if (softDeleted)
-            conditions.push(softDeleted);
+        conditions.push(...this.relatedRowScope(target, options));
         const total = (0, drizzle_orm_1.sql) `count(*)`;
         if (this.relationType(relation) === "manyToMany") {
             const joinLocal = relation.through[relation.throughLocalKey];
@@ -2442,6 +2462,7 @@ class SqlBaseCrudService {
     }
     pushColumnCondition(conditions, column, value, caseInsensitive = this.config.sql?.caseSensitive === false) {
         if (Array.isArray(value)) {
+            this.assertBatchSize(value.length);
             conditions.push((0, drizzle_orm_1.inArray)(column, value.map((item) => this.coerceFilterValue(column, item))));
         }
         else if ((0, merge_config_1.isPlainObject)(value)) {
@@ -2463,9 +2484,9 @@ class SqlBaseCrudService {
         const targetConditions = this.compileFilterAt(this.relationHost(relation, relation.table, name), value, db, new Set(), options);
         if (targetConditions.length === 0)
             return undefined;
-        return this.collectionCondition(relation, targetConditions, db, this.rootHost());
+        return this.collectionCondition(relation, targetConditions, db, this.rootHost(), options);
     }
-    collectionCondition(relation, targetConditions, db, host) {
+    collectionCondition(relation, targetConditions, db, host, options) {
         const target = relation.table;
         const manyToMany = this.relationType(relation) === "manyToMany";
         const joinLocal = manyToMany
@@ -2475,9 +2496,7 @@ class SqlBaseCrudService {
         if (!key)
             return undefined;
         const conditions = [...targetConditions];
-        const softDeleted = this.softDeleteCondition(target);
-        if (softDeleted)
-            conditions.push(softDeleted);
+        conditions.push(...this.relatedRowScope(target, options));
         let subquery;
         if (manyToMany) {
             const referenced = target[relation.references ?? "id"];
@@ -2506,9 +2525,7 @@ class SqlBaseCrudService {
             return undefined;
         const parentKey = this.parentKeyOf(relation, host.source);
         const conditions = [];
-        const softDeleted = this.softDeleteCondition(target);
-        if (softDeleted)
-            conditions.push(softDeleted);
+        conditions.push(...this.relatedRowScope(target, options));
         if (compiled.length > 0) {
             const matched = (0, drizzle_orm_1.and)(...compiled);
             conditions.push(quantifier === "every"
@@ -2537,11 +2554,10 @@ class SqlBaseCrudService {
         const compiled = this.compileFilterAt(this.relationHost(relation, target, name), inner, db, new Set(), options);
         if (compiled.length === 0)
             return undefined;
-        const softDeleted = this.softDeleteCondition(target);
         return (0, drizzle_orm_1.exists)(db
             .select({ one: (0, drizzle_orm_1.sql) `1` })
             .from(target)
-            .where((0, drizzle_orm_1.and)((0, drizzle_orm_1.eq)(target[relation.references ?? "id"], host.table[relation.localKey]), ...compiled, ...(softDeleted ? [softDeleted] : []))));
+            .where((0, drizzle_orm_1.and)((0, drizzle_orm_1.eq)(target[relation.references ?? "id"], host.table[relation.localKey]), ...compiled, ...this.relatedRowScope(target, options))));
     }
     rootHost() {
         return {
@@ -2562,6 +2578,7 @@ class SqlBaseCrudService {
         };
     }
     buildFilterConditions(filters, db = this.config.db, options) {
+        (0, query_parser_1.assertFilterDepth)(filters);
         const joins = new Set();
         const conditions = this.compileFilterAt(this.rootHost(), filters, db, joins, options);
         return { conditions, relations: Array.from(joins) };
@@ -2638,7 +2655,7 @@ class SqlBaseCrudService {
                 const compiled = this.compileFilterAt(this.relationHost(relation, relation.table, path), inner, db, new Set(), options);
                 if (compiled.length === 0 && !quantified)
                     continue;
-                const condition = this.collectionCondition(relation, compiled, db, host);
+                const condition = this.collectionCondition(relation, compiled, db, host, options);
                 if (condition)
                     parts.push(condition);
             }
@@ -2694,8 +2711,24 @@ class SqlBaseCrudService {
         if (!Array.isArray(raw)) {
             throw new common_1.BadRequestException(`Filter operator "${op}" expects an array`);
         }
+        this.assertBatchSize(raw.length);
         return raw;
     }
+    static MAX_BATCH_PARAMETERS = 60_000;
+    assertBatchSize(parameters) {
+        const max = SqlBaseCrudService.MAX_BATCH_PARAMETERS;
+        if (parameters > max) {
+            throw new common_1.BadRequestException(`Too many values in one call (${parameters}); the limit is ${max}. Split the batch.`);
+        }
+    }
+    insertParameters(rows) {
+        let widest = 0;
+        for (const row of rows) {
+            if ((0, merge_config_1.isPlainObject)(row))
+                widest = Math.max(widest, Object.keys(row).length);
+        }
+        return rows.length * (widest + 4);
+    }
     requirePostgres(op) {
         if (this.config.dialect !== "postgresql") {
             throw new common_1.BadRequestException(`Filter operator "${op}" is only supported on PostgreSQL`);
@@ -2822,7 +2855,7 @@ class SqlBaseCrudService {
     }
     async fullTextSearch(searchTerm, searchColumns, pagination, options) {
         if (this.config.dialect !== "postgresql") {
-            throw new Error("Full-text search only supported in PostgreSQL");
+            throw new common_1.BadRequestException("Full-text search only supported in PostgreSQL");
         }
         if (!Array.isArray(searchColumns) || searchColumns.length === 0) {
             throw new common_1.BadRequestException("Full-text search needs at least one column");