n8n 1.115.2 → 1.116.1

package/dist/modules/data-table/{data-store-proxy.service.js → data-table-proxy.service.js}

@@ -9,12 +9,12 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataStoreProxyService = void 0;
+exports.DataTableProxyService = void 0;
 exports.isAllowedNode = isAllowedNode;
 const backend_common_1 = require("@n8n/backend-common");
 const di_1 = require("@n8n/di");
+const data_table_service_1 = require("./data-table.service");
 const ownership_service_1 = require("../../services/ownership.service");
-const data_store_service_1 = require("./data-store.service");
 const ALLOWED_NODES = [
     'n8n-nodes-base.dataTable',
     'n8n-nodes-base.dataTableTool',
@@ -24,9 +24,9 @@ const ALLOWED_NODES = [
 function isAllowedNode(s) {
     return ALLOWED_NODES.includes(s);
 }
-let DataStoreProxyService = class DataStoreProxyService {
-    constructor(dataStoreService, ownershipService, logger) {
-        this.dataStoreService = dataStoreService;
+let DataTableProxyService = class DataTableProxyService {
+    constructor(dataTableService, ownershipService, logger) {
+        this.dataTableService = dataTableService;
         this.ownershipService = ownershipService;
         this.logger = logger;
         this.logger = this.logger.scoped('data-table');
@@ -40,18 +40,18 @@ let DataStoreProxyService = class DataStoreProxyService {
         const homeProject = await this.ownershipService.getWorkflowProjectCached(workflow.id);
         return homeProject.id;
     }
-    async getDataStoreAggregateProxy(workflow, node, projectId) {
+    async getDataTableAggregateProxy(workflow, node, projectId) {
         this.validateRequest(node);
         projectId = projectId ?? (await this.getProjectId(workflow));
         return this.makeAggregateOperations(projectId);
     }
-    async getDataStoreProxy(workflow, node, dataStoreId, projectId) {
+    async getDataTableProxy(workflow, node, dataTableId, projectId) {
         this.validateRequest(node);
         projectId = projectId ?? (await this.getProjectId(workflow));
-        return this.makeDataStoreOperations(projectId, dataStoreId);
+        return this.makeDataTableOperations(projectId, dataTableId);
     }
     makeAggregateOperations(projectId) {
-        const dataStoreService = this.dataStoreService;
+        const dataTableService = this.dataTableService;
         return {
             getProjectId() {
                 return projectId;
@@ -61,60 +61,60 @@ let DataStoreProxyService = class DataStoreProxyService {
                     ...options,
                     filter: { projectId, ...(options.filter ?? {}) },
                 };
-                return await dataStoreService.getManyAndCount(serviceOptions);
+                return await dataTableService.getManyAndCount(serviceOptions);
             },
-            async createDataStore(options) {
-                return await dataStoreService.createDataStore(projectId, options);
+            async createDataTable(options) {
+                return await dataTableService.createDataTable(projectId, options);
             },
-            async deleteDataStoreAll() {
-                return await dataStoreService.deleteDataStoreByProjectId(projectId);
+            async deleteDataTableAll() {
+                return await dataTableService.deleteDataTableByProjectId(projectId);
             },
         };
     }
-    makeDataStoreOperations(projectId, dataStoreId) {
-        const dataStoreService = this.dataStoreService;
+    makeDataTableOperations(projectId, dataTableId) {
+        const dataTableService = this.dataTableService;
         return {
-            async updateDataStore(options) {
-                return await dataStoreService.updateDataStore(dataStoreId, projectId, options);
+            async updateDataTable(options) {
+                return await dataTableService.updateDataTable(dataTableId, projectId, options);
             },
-            async deleteDataStore() {
-                return await dataStoreService.deleteDataStore(dataStoreId, projectId);
+            async deleteDataTable() {
+                return await dataTableService.deleteDataTable(dataTableId, projectId);
             },
             async getColumns() {
-                return await dataStoreService.getColumns(dataStoreId, projectId);
+                return await dataTableService.getColumns(dataTableId, projectId);
             },
             async addColumn(options) {
-                return await dataStoreService.addColumn(dataStoreId, projectId, options);
+                return await dataTableService.addColumn(dataTableId, projectId, options);
             },
             async moveColumn(columnId, options) {
-                return await dataStoreService.moveColumn(dataStoreId, projectId, columnId, options);
+                return await dataTableService.moveColumn(dataTableId, projectId, columnId, options);
             },
             async deleteColumn(columnId) {
-                return await dataStoreService.deleteColumn(dataStoreId, projectId, columnId);
+                return await dataTableService.deleteColumn(dataTableId, projectId, columnId);
             },
             async getManyRowsAndCount(options) {
-                return await dataStoreService.getManyRowsAndCount(dataStoreId, projectId, options);
+                return await dataTableService.getManyRowsAndCount(dataTableId, projectId, options);
             },
             async insertRows(rows, returnType) {
-                return await dataStoreService.insertRows(dataStoreId, projectId, rows, returnType);
+                return await dataTableService.insertRows(dataTableId, projectId, rows, returnType);
             },
             async updateRows(options) {
-                return await dataStoreService.updateRows(dataStoreId, projectId, { filter: options.filter, data: options.data }, true, options.dryRun);
+                return await dataTableService.updateRows(dataTableId, projectId, { filter: options.filter, data: options.data }, true, options.dryRun);
             },
             async upsertRow(options) {
-                return await dataStoreService.upsertRow(dataStoreId, projectId, options, true, options.dryRun);
+                return await dataTableService.upsertRow(dataTableId, projectId, options, true, options.dryRun);
             },
             async deleteRows(options) {
-                return await dataStoreService.deleteRows(dataStoreId, projectId, { filter: options.filter }, true, options.dryRun);
+                return await dataTableService.deleteRows(dataTableId, projectId, { filter: options.filter }, true, options.dryRun);
             },
         };
     }
 };
-exports.DataStoreProxyService = DataStoreProxyService;
-exports.DataStoreProxyService = DataStoreProxyService = __decorate([
+exports.DataTableProxyService = DataTableProxyService;
+exports.DataTableProxyService = DataTableProxyService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [data_store_service_1.DataStoreService,
+    __metadata("design:paramtypes", [data_table_service_1.DataTableService,
         ownership_service_1.OwnershipService,
         backend_common_1.Logger])
-], DataStoreProxyService);
-//# sourceMappingURL=data-store-proxy.service.js.map
+], DataTableProxyService);
+//# sourceMappingURL=data-table-proxy.service.js.map

package/dist/modules/data-table/{data-store-proxy.service.js.map → data-table-proxy.service.js.map}

@@ -1 +1 @@
-{"version":3,"file":"data-store-proxy.service.js","sourceRoot":"","sources":["../../../src/modules/data-table/data-store-proxy.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"data-table-proxy.service.js","sourceRoot":"","sources":["../../../src/modules/data-table/data-table-proxy.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/data-table/data-table-rows.repository.d.ts

@@ -0,0 +1,31 @@
+import { DataTableFilter, ListDataTableContentQueryDto } from '@n8n/api-types';
+import { DataSource, EntityManager } from '@n8n/typeorm';
+import { DataTableColumnJsType, DataTableRows, DataTableRowReturn, DataTableRowsReturn, DataTableInsertRowsReturnType, DataTableInsertRowsResult, DataTableRowReturnWithState } from 'n8n-workflow';
+import { DataTableColumn } from './data-table-column.entity';
+import { DataTableUserTableName } from './data-table.types';
+export declare class DataTableRowsRepository {
+    private dataSource;
+    constructor(dataSource: DataSource);
+    insertRowsBulk(table: DataTableUserTableName, rows: DataTableRows, columns: DataTableColumn[], trx?: EntityManager): Promise<{
+        readonly success: true;
+        readonly insertedRows: number;
+    }>;
+    insertRows<T extends DataTableInsertRowsReturnType>(dataTableId: string, rows: DataTableRows, columns: DataTableColumn[], returnType: T, trx?: EntityManager): Promise<DataTableInsertRowsResult<T>>;
+    updateRows<T extends boolean | undefined>(dataTableId: string, data: Record<string, DataTableColumnJsType | null>, filter: DataTableFilter, columns: DataTableColumn[], returnData?: T, trx?: EntityManager): Promise<T extends true ? DataTableRowReturn[] : true>;
+    dryRunUpdateRows(dataTableId: string, data: Record<string, DataTableColumnJsType | null>, filter: DataTableFilter, columns: DataTableColumn[], trx?: EntityManager): Promise<DataTableRowReturnWithState[]>;
+    dryRunUpsertRow(dataTableId: string, data: Record<string, DataTableColumnJsType | null>, filter: DataTableFilter, columns: DataTableColumn[], trx?: EntityManager): Promise<DataTableRowReturnWithState[]>;
+    deleteRows(dataTableId: string, columns: DataTableColumn[], filter: DataTableFilter | undefined, returnData?: boolean, dryRun?: boolean, trx?: EntityManager): Promise<true | DataTableRowReturn[] | DataTableRowReturnWithState[]>;
+    private getAffectedRowsForUpdate;
+    private prepareUpdateData;
+    private toDryRunRows;
+    getManyAndCount(dataTableId: string, dto: ListDataTableContentQueryDto, trx?: EntityManager): Promise<{
+        count: number;
+        data: DataTableRowsReturn;
+    }>;
+    getManyByIds(dataTableId: string, ids: number[], columns: DataTableColumn[], trx?: EntityManager): Promise<DataTableRowsReturn>;
+    private getManyQuery;
+    private applyFilters;
+    private applySorting;
+    private applySortingByField;
+    private applyPagination;
+}

package/dist/modules/data-table/{data-store-rows.repository.js → data-table-rows.repository.js}

@@ -9,13 +9,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataStoreRowsRepository = void 0;
+exports.DataTableRowsRepository = void 0;
 const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const typeorm_1 = require("@n8n/typeorm");
 const n8n_workflow_1 = require("n8n-workflow");
 const sql_utils_1 = require("./utils/sql-utils");
-function getConditionAndParams(filter, index, dbType, tableReference, columns) {
+function getConditionAndParams(filter, index, dbType, tableReference) {
     const paramName = `filter_${index}`;
     const columnRef = tableReference
         ? `${(0, sql_utils_1.quoteIdentifier)(tableReference, dbType)}.${(0, sql_utils_1.quoteIdentifier)(filter.columnName, dbType)}`
@@ -28,8 +28,7 @@ function getConditionAndParams(filter, index, dbType, tableReference, columns) {
                 return [`${columnRef} IS NOT NULL`, {}];
         }
     }
-    const columnInfo = columns?.find((col) => col.name === filter.columnName);
-    const value = columnInfo ? (0, sql_utils_1.normalizeValue)(filter.value, columnInfo?.type, dbType) : filter.value;
+    const value = filter.value;
     const operators = {
         eq: '=',
         gt: '>',
@@ -84,7 +83,7 @@ function getConditionAndParams(filter, index, dbType, tableReference, columns) {
     }
     throw new Error(`Unsupported filter condition: ${filter.condition}`);
 }
-let DataStoreRowsRepository = class DataStoreRowsRepository {
+let DataTableRowsRepository = class DataTableRowsRepository {
     constructor(dataSource) {
         this.dataSource = dataSource;
     }
@@ -115,7 +114,7 @@ let DataStoreRowsRepository = class DataStoreRowsRepository {
                     for (let h = 0; h < columnNames.length; ++h) {
                         const column = columns[h];
                         const value = rows[j][column.name] ?? null;
-                        insertArray[h] = (0, sql_utils_1.normalizeValue)(value, column.type, dbType);
+                        insertArray[h] = (0, sql_utils_1.normalizeValueForDatabase)(value, column.type, dbType);
                     }
                     completeRows[j - start] = insertArray;
                 }
@@ -130,12 +129,12 @@ let DataStoreRowsRepository = class DataStoreRowsRepository {
             return { success: true, insertedRows };
         });
     }
-    async insertRows(dataStoreId, rows, columns, returnType, trx) {
+    async insertRows(dataTableId, rows, columns, returnType, trx) {
         return await (0, db_1.withTransaction)(this.dataSource.manager, trx, async (em) => {
             const inserted = [];
             const dbType = this.dataSource.options.type;
             const useReturning = dbType === 'postgres' || dbType === 'mariadb';
-            const table = (0, sql_utils_1.toTableName)(dataStoreId);
+            const table = (0, sql_utils_1.toTableName)(dataTableId);
             const escapedColumns = columns.map((c) => this.dataSource.driver.escape(c.name));
             const escapedSystemColumns = n8n_workflow_1.DATA_TABLE_SYSTEM_COLUMNS.map((x) => this.dataSource.driver.escape(x));
             const selectColumns = [...escapedSystemColumns, ...escapedColumns];
@@ -148,7 +147,7 @@ let DataStoreRowsRepository = class DataStoreRowsRepository {
                     if (!(column.name in completeRow)) {
                         completeRow[column.name] = null;
                     }
-                    completeRow[column.name] = (0, sql_utils_1.normalizeValue)(completeRow[column.name], column.type, dbType);
+                    completeRow[column.name] = (0, sql_utils_1.normalizeValueForDatabase)(completeRow[column.name], column.type, dbType);
                 }
                 const query = em.createQueryBuilder().insert().into(table).values(completeRow);
                 if (useReturning) {
@@ -170,28 +169,28 @@ let DataStoreRowsRepository = class DataStoreRowsRepository {
                     inserted.push(...ids.map((id) => ({ id })));
                     continue;
                 }
-                const insertedRows = await this.getManyByIds(dataStoreId, ids, columns, em);
+                const insertedRows = await this.getManyByIds(dataTableId, ids, columns, em);
                 inserted.push(...insertedRows);
             }
             return inserted;
         });
     }
-    async updateRows(dataStoreId, data, filter, columns, returnData = false, trx) {
+    async updateRows(dataTableId, data, filter, columns, returnData = false, trx) {
         return await (0, db_1.withTransaction)(this.dataSource.manager, trx, async (em) => {
             const dbType = this.dataSource.options.type;
             const useReturning = dbType === 'postgres';
-            const table = (0, sql_utils_1.toTableName)(dataStoreId);
+            const table = (0, sql_utils_1.toTableName)(dataTableId);
             const escapedColumns = columns.map((c) => this.dataSource.driver.escape(c.name));
             const escapedSystemColumns = n8n_workflow_1.DATA_TABLE_SYSTEM_COLUMNS.map((x) => this.dataSource.driver.escape(x));
             const selectColumns = [...escapedSystemColumns, ...escapedColumns];
             const setData = this.prepareUpdateData(data, columns, dbType);
             let affectedRows = [];
             if (!useReturning && returnData) {
-                affectedRows = await this.getAffectedRowsForUpdate(dataStoreId, filter, columns, true, trx);
+                affectedRows = await this.getAffectedRowsForUpdate(dataTableId, filter, columns, true, trx);
             }
-            setData.updatedAt = (0, sql_utils_1.normalizeValue)(new Date(), 'date', dbType);
+            setData.updatedAt = (0, sql_utils_1.normalizeValueForDatabase)(new Date(), 'date', dbType);
             const query = em.createQueryBuilder().update(table);
-            this.applyFilters(query, filter, undefined, columns);
+            this.applyFilters(query, filter, undefined);
             query.set(setData);
             if (useReturning && returnData) {
                 query.returning(selectColumns.join(','));
@@ -204,20 +203,20 @@ let DataStoreRowsRepository = class DataStoreRowsRepository {
                 return (0, sql_utils_1.normalizeRows)((0, sql_utils_1.extractReturningData)(result.raw), columns);
             }
             const ids = affectedRows.map((row) => row.id);
-            return await this.getManyByIds(dataStoreId, ids, columns, em);
+            return await this.getManyByIds(dataTableId, ids, columns, em);
         });
     }
-    async dryRunUpdateRows(dataStoreId, data, filter, columns, trx) {
+    async dryRunUpdateRows(dataTableId, data, filter, columns, trx) {
         const dbType = this.dataSource.options.type;
-        const beforeRows = await this.getAffectedRowsForUpdate(dataStoreId, filter, columns, false, trx);
+        const beforeRows = await this.getAffectedRowsForUpdate(dataTableId, filter, columns, false, trx);
         const columnUpdates = this.prepareUpdateData(data, columns, dbType);
         return beforeRows.flatMap((original) => {
             const updated = { ...original, ...columnUpdates, updatedAt: new Date() };
             return this.toDryRunRows(original, updated);
         });
     }
-    async dryRunUpsertRow(dataStoreId, data, filter, columns, trx) {
-        const updateResult = await this.dryRunUpdateRows(dataStoreId, data, filter, columns, trx);
+    async dryRunUpsertRow(dataTableId, data, filter, columns, trx) {
+        const updateResult = await this.dryRunUpdateRows(dataTableId, data, filter, columns, trx);
         if (updateResult.length > 0) {
             return updateResult;
         }
@@ -241,7 +240,7 @@ let DataStoreRowsRepository = class DataStoreRowsRepository {
             if (!shouldReturnData) {
                 const query = em.createQueryBuilder().delete().from(table, 'dataTable');
                 if (filter) {
-                    this.applyFilters(query, filter, undefined, columns);
+                    this.applyFilters(query, filter, undefined);
                 }
                 await query.execute();
                 return true;
@@ -250,7 +249,7 @@ let DataStoreRowsRepository = class DataStoreRowsRepository {
             if (!useReturning) {
                 const selectQuery = em.createQueryBuilder().select('*').from(table, 'dataTable');
                 if (filter) {
-                    this.applyFilters(selectQuery, filter, 'dataTable', columns);
+                    this.applyFilters(selectQuery, filter, 'dataTable');
                 }
                 const rawRows = await selectQuery.getRawMany();
                 affectedRows = (0, sql_utils_1.normalizeRows)(rawRows, columns);
@@ -266,7 +265,7 @@ let DataStoreRowsRepository = class DataStoreRowsRepository {
                 deleteQuery.returning(selectColumns.join(','));
             }
             if (filter) {
-                this.applyFilters(deleteQuery, filter, undefined, columns);
+                this.applyFilters(deleteQuery, filter, undefined);
             }
             const result = await deleteQuery.execute();
             if (useReturning) {
@@ -275,12 +274,12 @@ let DataStoreRowsRepository = class DataStoreRowsRepository {
             return affectedRows;
         });
     }
-    async getAffectedRowsForUpdate(dataStoreId, filter, columns, idsOnly, trx) {
+    async getAffectedRowsForUpdate(dataTableId, filter, columns, idsOnly, trx) {
         return await (0, db_1.withTransaction)(this.dataSource.manager, trx, async (em) => {
-            const table = (0, sql_utils_1.toTableName)(dataStoreId);
+            const table = (0, sql_utils_1.toTableName)(dataTableId);
             const selectColumns = idsOnly ? 'id' : '*';
             const selectQuery = em.createQueryBuilder().select(selectColumns).from(table, 'dataTable');
-            this.applyFilters(selectQuery, filter, 'dataTable', columns);
+            this.applyFilters(selectQuery, filter, 'dataTable');
             const rawRows = await selectQuery.getRawMany();
             if (idsOnly) {
                 return rawRows;
@@ -292,7 +291,7 @@ let DataStoreRowsRepository = class DataStoreRowsRepository {
         const setData = { ...data };
         for (const column of columns) {
             if (column.name in setData) {
-                setData[column.name] = (0, sql_utils_1.normalizeValue)(setData[column.name], column.type, dbType);
+                setData[column.name] = (0, sql_utils_1.normalizeValueForDatabase)(setData[column.name], column.type, dbType);
             }
         }
         return setData;
@@ -321,37 +320,9 @@ let DataStoreRowsRepository = class DataStoreRowsRepository {
             { ...after, dryRunState: 'after' },
         ];
     }
-    async createTableWithColumns(dataStoreId, columns, trx) {
-        await (0, db_1.withTransaction)(this.dataSource.manager, trx, async (em) => {
-            if (!em.queryRunner) {
-                throw new n8n_workflow_1.UnexpectedError('QueryRunner is not available');
-            }
-            const dslColumns = [new db_1.DslColumn('id').int.autoGenerate2.primary, ...(0, sql_utils_1.toDslColumns)(columns)];
-            const createTable = new db_1.CreateTable((0, sql_utils_1.toTableName)(dataStoreId), '', em.queryRunner).withColumns(...dslColumns).withTimestamps;
-            await createTable.execute(em.queryRunner);
-        });
-    }
-    async dropTable(dataStoreId, trx) {
-        await (0, db_1.withTransaction)(this.dataSource.manager, trx, async (em) => {
-            if (!em.queryRunner) {
-                throw new n8n_workflow_1.UnexpectedError('QueryRunner is not available');
-            }
-            await em.queryRunner.dropTable((0, sql_utils_1.toTableName)(dataStoreId), true);
-        });
-    }
-    async addColumn(dataStoreId, column, dbType, trx) {
-        await (0, db_1.withTransaction)(this.dataSource.manager, trx, async (em) => {
-            await em.query((0, sql_utils_1.addColumnQuery)((0, sql_utils_1.toTableName)(dataStoreId), column, dbType));
-        });
-    }
-    async dropColumnFromTable(dataStoreId, columnName, dbType, trx) {
-        await (0, db_1.withTransaction)(this.dataSource.manager, trx, async (em) => {
-            await em.query((0, sql_utils_1.deleteColumnQuery)((0, sql_utils_1.toTableName)(dataStoreId), columnName, dbType));
-        });
-    }
-    async getManyAndCount(dataStoreId, dto, columns, trx) {
+    async getManyAndCount(dataTableId, dto, trx) {
         return await (0, db_1.withTransaction)(this.dataSource.manager, trx, async (em) => {
-            const [countQuery, query] = this.getManyQuery(dataStoreId, dto, em, columns);
+            const [countQuery, query] = this.getManyQuery(dataTableId, dto, em);
             const data = await query.select('*').getRawMany();
             const countResult = await countQuery.select('COUNT(*) as count').getRawOne();
             const count = typeof countResult?.count === 'number'
@@ -360,9 +331,9 @@ let DataStoreRowsRepository = class DataStoreRowsRepository {
             return { count: count ?? -1, data };
         }, false);
     }
-    async getManyByIds(dataStoreId, ids, columns, trx) {
+    async getManyByIds(dataTableId, ids, columns, trx) {
         return await (0, db_1.withTransaction)(this.dataSource.manager, trx, async (em) => {
-            const table = (0, sql_utils_1.toTableName)(dataStoreId);
+            const table = (0, sql_utils_1.toTableName)(dataTableId);
             const escapedColumns = columns.map((c) => this.dataSource.driver.escape(c.name));
             const escapedSystemColumns = n8n_workflow_1.DATA_TABLE_SYSTEM_COLUMNS.map((x) => this.dataSource.driver.escape(x));
             const selectColumns = [...escapedSystemColumns, ...escapedColumns];
@@ -378,23 +349,23 @@ let DataStoreRowsRepository = class DataStoreRowsRepository {
             return (0, sql_utils_1.normalizeRows)(rows, columns);
         }, false);
     }
-    getManyQuery(dataStoreId, dto, em, columns) {
+    getManyQuery(dataTableId, dto, em) {
         const query = em.createQueryBuilder();
         const tableReference = 'dataTable';
-        query.from((0, sql_utils_1.toTableName)(dataStoreId), tableReference);
+        query.from((0, sql_utils_1.toTableName)(dataTableId), tableReference);
         if (dto.filter) {
-            this.applyFilters(query, dto.filter, tableReference, columns);
+            this.applyFilters(query, dto.filter, tableReference);
         }
         const countQuery = query.clone().select('COUNT(*)');
         this.applySorting(query, dto);
         this.applyPagination(query, dto);
         return [countQuery, query];
     }
-    applyFilters(query, filter, tableReference, columns) {
+    applyFilters(query, filter, tableReference) {
         const filters = filter.filters ?? [];
         const filterType = filter.type ?? 'and';
         const dbType = this.dataSource.options.type;
-        const conditionsAndParams = filters.map((filter, i) => getConditionAndParams(filter, i, dbType, tableReference, columns));
+        const conditionsAndParams = filters.map((filter, i) => getConditionAndParams(filter, i, dbType, tableReference));
         if (conditionsAndParams.length === 1) {
             const [condition, params] = conditionsAndParams[0];
             query.andWhere(condition, params);
@@ -428,9 +399,9 @@ let DataStoreRowsRepository = class DataStoreRowsRepository {
             query.take(dto.take);
     }
 };
-exports.DataStoreRowsRepository = DataStoreRowsRepository;
-exports.DataStoreRowsRepository = DataStoreRowsRepository = __decorate([
+exports.DataTableRowsRepository = DataTableRowsRepository;
+exports.DataTableRowsRepository = DataTableRowsRepository = __decorate([
     (0, di_1.Service)(),
     __metadata("design:paramtypes", [typeorm_1.DataSource])
-], DataStoreRowsRepository);
-//# sourceMappingURL=data-store-rows.repository.js.map
+], DataTableRowsRepository);
+//# sourceMappingURL=data-table-rows.repository.js.map

package/dist/modules/data-table/data-table-rows.repository.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-table-rows.repository.js","sourceRoot":"","sources":["../../../src/modules/data-table/data-table-rows.repository.ts"],"names":[],"mappings":"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"}

package/dist/modules/data-table/{data-store-size-validator.service.d.ts → data-table-size-validator.service.d.ts}

@@ -1,11 +1,13 @@
 import { GlobalConfig } from '@n8n/config';
 import { DataTableSizeStatus, DataTablesSizeData } from 'n8n-workflow';
-export declare class DataStoreSizeValidator {
+import { Telemetry } from '../../telemetry';
+export declare class DataTableSizeValidator {
     private readonly globalConfig;
+    private readonly telemetry;
     private lastCheck;
     private cachedSizeData;
     private pendingCheck;
-    constructor(globalConfig: GlobalConfig);
+    constructor(globalConfig: GlobalConfig, telemetry: Telemetry);
     private shouldRefresh;
     getCachedSizeData(fetchSizeDataFn: () => Promise<DataTablesSizeData>, now?: Date): Promise<DataTablesSizeData>;
     validateSize(fetchSizeFn: () => Promise<DataTablesSizeData>, now?: Date): Promise<void>;

package/dist/modules/data-table/{data-store-size-validator.service.js → data-table-size-validator.service.js}

@@ -9,13 +9,15 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataStoreSizeValidator = void 0;
+exports.DataTableSizeValidator = void 0;
 const config_1 = require("@n8n/config");
 const di_1 = require("@n8n/di");
-const data_store_validation_error_1 = require("./errors/data-store-validation.error");
-let DataStoreSizeValidator = class DataStoreSizeValidator {
-    constructor(globalConfig) {
+const telemetry_1 = require("../../telemetry");
+const data_table_validation_error_1 = require("./errors/data-table-validation.error");
+let DataTableSizeValidator = class DataTableSizeValidator {
+    constructor(globalConfig, telemetry) {
         this.globalConfig = globalConfig;
+        this.telemetry = telemetry;
         this.pendingCheck = null;
     }
     shouldRefresh(now) {
@@ -47,14 +49,20 @@ let DataStoreSizeValidator = class DataStoreSizeValidator {
     async validateSize(fetchSizeFn, now = new Date()) {
         const size = await this.getCachedSizeData(fetchSizeFn, now);
         if (size.totalBytes >= this.globalConfig.dataTable.maxSize) {
-            throw new data_store_validation_error_1.DataStoreValidationError(`Data store size limit exceeded: ${this.toMb(size.totalBytes)}MB used, limit is ${this.toMb(this.globalConfig.dataTable.maxSize)}MB`);
+            this.telemetry.track('User hit data table storage limit', {
+                total_bytes: size.totalBytes,
+                max_bytes: this.globalConfig.dataTable.maxSize,
+            });
+            throw new data_table_validation_error_1.DataTableValidationError(`Data table size limit exceeded: ${this.toMb(size.totalBytes)}MB used, limit is ${this.toMb(this.globalConfig.dataTable.maxSize)}MB`);
         }
     }
     sizeToState(sizeBytes) {
+        const warningThreshold = this.globalConfig.dataTable.warningThreshold ??
+            Math.floor(0.8 * this.globalConfig.dataTable.maxSize);
         if (sizeBytes >= this.globalConfig.dataTable.maxSize) {
             return 'error';
         }
-        else if (sizeBytes >= this.globalConfig.dataTable.warningThreshold) {
+        else if (sizeBytes >= warningThreshold) {
             return 'warn';
         }
         return 'ok';
@@ -72,9 +80,10 @@ let DataStoreSizeValidator = class DataStoreSizeValidator {
         this.pendingCheck = null;
     }
 };
-exports.DataStoreSizeValidator = DataStoreSizeValidator;
-exports.DataStoreSizeValidator = DataStoreSizeValidator = __decorate([
+exports.DataTableSizeValidator = DataTableSizeValidator;
+exports.DataTableSizeValidator = DataTableSizeValidator = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [config_1.GlobalConfig])
-], DataStoreSizeValidator);
-//# sourceMappingURL=data-store-size-validator.service.js.map
+    __metadata("design:paramtypes", [config_1.GlobalConfig,
+        telemetry_1.Telemetry])
+], DataTableSizeValidator);
+//# sourceMappingURL=data-table-size-validator.service.js.map

package/dist/modules/data-table/data-table-size-validator.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-table-size-validator.service.js","sourceRoot":"","sources":["../../../src/modules/data-table/data-table-size-validator.service.ts"],"names":[],"mappings":"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"}