refactor(core): Move copyInputItems to node helpers (no-changelog) (#7299)

This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™
2023-10-06 16:25:58 +02:00
committed by GitHub
parent 34bda535e6
commit 597669aa62
9 changed files with 84 additions and 95 deletions

View File

@@ -1,31 +1,14 @@
import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
import { deepCopy } from 'n8n-workflow';
import type snowflake from 'snowflake-sdk';
export async function connect(conn: snowflake.Connection) {
return new Promise((resolve, reject) => {
conn.connect((err, _conn) => {
if (!err) {
// @ts-ignore
resolve();
} else {
reject(err);
}
});
return new Promise<void>((resolve, reject) => {
conn.connect((error) => (error ? reject(error) : resolve()));
});
}
export async function destroy(conn: snowflake.Connection) {
return new Promise((resolve, reject) => {
conn.destroy((err, _conn) => {
if (!err) {
// @ts-ignore
resolve();
} else {
reject(err);
}
});
return new Promise<void>((resolve, reject) => {
conn.destroy((error) => (error ? reject(error) : resolve()));
});
}
@@ -34,33 +17,11 @@ export async function execute(
sqlText: string,
binds: snowflake.InsertBinds,
) {
return new Promise((resolve, reject) => {
return new Promise<any[] | undefined>((resolve, reject) => {
conn.execute({
sqlText,
binds,
complete: (err, stmt, rows) => {
if (!err) {
resolve(rows);
} else {
reject(err);
}
},
complete: (error, stmt, rows) => (error ? reject(error) : resolve(rows)),
});
});
}
export function copyInputItems(items: INodeExecutionData[], properties: string[]): IDataObject[] {
// Prepare the data to insert and copy it to be returned
let newItem: IDataObject;
return items.map((item) => {
newItem = {};
for (const property of properties) {
if (item.json[property] === undefined) {
newItem[property] = null;
} else {
newItem[property] = deepCopy(item.json[property]);
}
}
return newItem;
});
}

View File

@@ -6,7 +6,7 @@ import type {
INodeTypeDescription,
} from 'n8n-workflow';
import { connect, copyInputItems, destroy, execute } from './GenericFunctions';
import { connect, destroy, execute } from './GenericFunctions';
import snowflake from 'snowflake-sdk';
import { getResolvables } from '@utils/utilities';
@@ -207,7 +207,7 @@ export class Snowflake implements INodeType {
const query = `INSERT INTO ${table}(${columns.join(',')}) VALUES (${columns
.map((_column) => '?')
.join(',')})`;
const data = copyInputItems(items, columns);
const data = this.helpers.copyInputItems(items, columns);
const binds = data.map((element) => Object.values(element));
await execute(connection, query, binds as unknown as snowflake.InsertBinds);
data.forEach((d, i) => {
@@ -236,7 +236,7 @@ export class Snowflake implements INodeType {
const query = `UPDATE ${table} SET ${columns
.map((column) => `${column} = ?`)
.join(',')} WHERE ${updateKey} = ?;`;
const data = copyInputItems(items, columns);
const data = this.helpers.copyInputItems(items, columns);
const binds = data.map((element) => Object.values(element).concat(element[updateKey]));
for (let i = 0; i < binds.length; i++) {
await execute(connection, query, binds[i] as unknown as snowflake.InsertBinds);