admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-16 17:46:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Add null to DataStoreColumnJsType (no-changelog) (#18733)

Browse Source
This commit is contained in:
Charlie Kolb
2025-08-25 15:59:40 +02:00
committed by GitHub
parent 1777803e26
commit 37ace47131
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/cli/src/modules/data-table/data-store-rows.repository.ts
View File

@@ -163,8 +163,8 @@ export class DataStoreRowsRepository {
async updateRow(
dataStoreId: string,
setData: Record<string, DataStoreColumnJsType | null>,
whereData: Record<string, DataStoreColumnJsType | null>,
setData: Record<string, DataStoreColumnJsType>,
whereData: Record<string, DataStoreColumnJsType>,
columns: DataStoreColumn[],
) {
const dbType = this.dataSource.options.type;
@@ -172,7 +172,7 @@ export class DataStoreRowsRepository {
const queryBuilder = this.dataSource.createQueryBuilder().update(this.toTableName(dataStoreId));
const setValues: Record<string, DataStoreColumnJsType | null> = {};
const setValues: Record<string, DataStoreColumnJsType> = {};
for (const [key, value] of Object.entries(setData)) {
setValues[key] = normalizeValue(value, columnTypeMap[key], dbType);
}
@@ -329,8 +329,7 @@ export class DataStoreRowsRepository {
}
});
const existing: Array<Record<string, DataStoreColumnJsType | null>> =
await queryBuilder.getRawMany();
const existing: Array<Record<string, DataStoreColumnJsType>> = await queryBuilder.getRawMany();
return splitRowsByExistence(existing, matchFields, rows);
}

4
packages/cli/src/modules/data-table/utils/sql-utils.ts
View File

@@ -236,10 +236,10 @@ export function normalizeRows(rows: DataStoreRows, columns: DataStoreColumn[]) {
}
export function normalizeValue(
value: DataStoreColumnJsType | null,
value: DataStoreColumnJsType,
columnType: string | undefined,
dbType: DataSourceOptions['type'],
): DataStoreColumnJsType | null {
): DataStoreColumnJsType {
if (['mysql', 'mariadb'].includes(dbType)) {
if (columnType === 'date') {
if (value instanceof Date) {

4
packages/workflow/src/data-store.types.ts
View File

@@ -70,9 +70,9 @@ export type MoveDataStoreColumnOptions = {
export type AddDataStoreColumnOptions = Pick<DataStoreColumn, 'name' | 'type'> &
Partial<Pick<DataStoreColumn, 'index'>>;
export type DataStoreColumnJsType = string | number | boolean | Date;
export type DataStoreColumnJsType = string | number | boolean | Date | null;
export type DataStoreRow = Record<string, DataStoreColumnJsType | null>;
export type DataStoreRow = Record<string, DataStoreColumnJsType>;
export type DataStoreRows = DataStoreRow[];
export type DataStoreRowWithId = DataStoreRow & { id: number };