npm - n8n-nodes-base - Versions diffs - 0.228.2 → 0.229.1 - Mend

n8n-nodes-base 0.228.2 → 0.229.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (66) hide show

package/dist/nodes/Postgres/v2/actions/database/insert.operation.js CHANGED Viewed

@@ -23,6 +23,11 @@ const properties = [
         ],
         default: 'autoMapInputData',
         description: 'Whether to map node input properties and the table data automatically or manually',
+        displayOptions: {
+            show: {
+                '@version': [2, 2.1],
+            },
+        },
     },
     {
         displayName: `
@@ -34,6 +39,7 @@ const properties = [
         displayOptions: {
             show: {
                 dataMode: ['autoMapInputData'],
+                '@version': [2, 2.1],
             },
         },
     },
@@ -49,6 +55,7 @@ const properties = [
         displayOptions: {
             show: {
                 dataMode: ['defineBelow'],
+                '@version': [2, 2.1],
             },
         },
         default: {},
@@ -78,6 +85,35 @@ const properties = [
             },
         ],
     },
+    {
+        displayName: 'Columns',
+        name: 'columns',
+        type: 'resourceMapper',
+        default: {
+            mappingMode: 'defineBelow',
+            value: null,
+        },
+        noDataExpression: true,
+        required: true,
+        typeOptions: {
+            loadOptionsDependsOn: ['table.value', 'operation'],
+            resourceMapper: {
+                resourceMapperMethod: 'getMappingColumns',
+                mode: 'add',
+                fieldWords: {
+                    singular: 'column',
+                    plural: 'columns',
+                },
+                addAllFields: true,
+                multiKeyMatch: true,
+            },
+        },
+        displayOptions: {
+            show: {
+                '@version': [2.2],
+            },
+        },
+    },
     common_descriptions_1.optionsCollection,
 ];
 const displayOptions = {
@@ -107,15 +143,25 @@ async function execute(runQueries, items, nodeOptions, db) {
         }
         let query = `INSERT INTO $1:name.$2:name($3:name) VALUES($3:csv)${onConflict}`;
         let values = [schema, table];
-        const dataMode = this.getNodeParameter('dataMode', i);
+        const nodeVersion = this.getNode().typeVersion;
+        const dataMode = nodeVersion < 2.2
+            ? this.getNodeParameter('dataMode', i)
+            : this.getNodeParameter('columns.mappingMode', i);
         let item = {};
         if (dataMode === 'autoMapInputData') {
             item = items[i].json;
         }
         if (dataMode === 'defineBelow') {
-            const valuesToSend = this.getNodeParameter('valuesToSend', i, [])
-                .values;
-            item = (0, utils_1.prepareItem)(valuesToSend);
+            const valuesToSend = nodeVersion < 2.2
+                ? this.getNodeParameter('valuesToSend', i, []).values
+                : this.getNodeParameter('columns.values', i, [])
+                    .values;
+            if (nodeVersion < 2.2) {
+                item = (0, utils_1.prepareItem)(valuesToSend);
+            }
+            else {
+                item = this.getNodeParameter('columns.value', i);
+            }
         }
         const tableSchema = await (0, utils_1.getTableSchema)(db, schema, table);
         values.push((0, utils_1.checkItemAgainstSchema)(this.getNode(), item, tableSchema, i));

package/dist/nodes/Postgres/v2/actions/database/insert.operation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"insert.operation.js","sourceRoot":"","sources":["../../../../../../nodes/Postgres/v2/actions/database/insert.operation.ts"],"names":[],"mappings":";;;AAGA,8DAAsE;AAStE,+CAM6B;AAE7B,gEAA2D;AAE3D,MAAM,UAAU,GAAsB;IACrC;QACC,WAAW,EAAE,WAAW;QACxB,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE;YACR;gBACC,IAAI,EAAE,gCAAgC;gBACtC,KAAK,EAAE,kBAAkB;gBACzB,WAAW,EAAE,2EAA2E;aACxF;YACD;gBACC,IAAI,EAAE,0BAA0B;gBAChC,KAAK,EAAE,aAAa;gBACpB,WAAW,EAAE,oDAAoD;aACjE;SACD;QACD,OAAO,EAAE,kBAAkB;QAC3B,WAAW,EACV,mFAAmF;~~KACpF~~;IACD;QACC,WAAW,EAAE;;GAEZ;QACD,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,EAAE;QACX,cAAc,EAAE;YACf,IAAI,EAAE;gBACL,QAAQ,EAAE,CAAC,kBAAkB,CAAC;~~aAC9B~~;SACD;KACD;IACD;QACC,WAAW,EAAE,gBAAgB;QAC7B,IAAI,EAAE,cAAc;QACpB,WAAW,EAAE,WAAW;QACxB,IAAI,EAAE,iBAAiB;QACvB,WAAW,EAAE;YACZ,uBAAuB,EAAE,WAAW;YACpC,cAAc,EAAE,IAAI;SACpB;QACD,cAAc,EAAE;YACf,IAAI,EAAE;gBACL,QAAQ,EAAE,CAAC,aAAa,CAAC;~~aACzB~~;SACD;QACD,OAAO,EAAE,EAAE;QACX,OAAO,EAAE;YACR;gBACC,WAAW,EAAE,QAAQ;gBACrB,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE;oBACP;wBAEC,WAAW,EAAE,QAAQ;wBACrB,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,SAAS;wBACf,WAAW,EACV,yHAAyH;wBAC1H,WAAW,EAAE;4BACZ,iBAAiB,EAAE,YAAY;4BAC/B,oBAAoB,EAAE,CAAC,cAAc,EAAE,aAAa,CAAC;yBACrD;wBACD,OAAO,EAAE,EAAE;qBACX;oBACD;wBACC,WAAW,EAAE,OAAO;wBACpB,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,QAAQ;wBACd,OAAO,EAAE,EAAE;qBACX;iBACD;aACD;SACD;KACD;IACD,uCAAiB;CACjB,CAAC;AAEF,MAAM,cAAc,GAAG;IACtB,IAAI,EAAE;QACL,QAAQ,EAAE,CAAC,UAAU,CAAC;QACtB,SAAS,EAAE,CAAC,QAAQ,CAAC;KACrB;IACD,IAAI,EAAE;QACL,KAAK,EAAE,CAAC,EAAE,CAAC;KACX;CACD,CAAC;AAEW,QAAA,WAAW,GAAG,IAAA,gCAAoB,EAAC,cAAc,EAAE,UAAU,CAAC,CAAC;AAErE,KAAK,UAAU,OAAO,CAE5B,UAAyB,EACzB,KAA2B,EAC3B,WAAwB,EACxB,EAAe;IAEf,KAAK,GAAG,IAAA,kCAA0B,EAAC,KAAK,EAAE,WAAW,CAAC,mBAA8B,CAAC,CAAC;IAEtF,MAAM,OAAO,GAAsB,EAAE,CAAC;IAEtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE;YAC5D,YAAY,EAAE,IAAI;SAClB,CAAW,CAAC;QAEb,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE;YAC1D,YAAY,EAAE,IAAI;SAClB,CAAW,CAAC;QAEb,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAExD,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,OAAO,CAAC,cAAc,EAAE;YAC3B,UAAU,GAAG,yBAAyB,CAAC;SACvC;QAED,IAAI,KAAK,GAAG,sDAAsD,UAAU,EAAE,CAAC;QAC/E,IAAI,MAAM,GAAgB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAE1C,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,CAAC,~~CAAW~~,CAAC;QAEhE,IAAI,IAAI,GAAgB,EAAE,CAAC;QAE3B,IAAI,QAAQ,KAAK,kBAAkB,EAAE;YACpC,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;SACrB;QAED,IAAI,QAAQ,KAAK,aAAa,EAAE;YAC/B,MAAM,YAAY,~~GAAI~~,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,CAAC,EAAE,EAAE,CAAiB;~~iBAChF~~,~~MAAuB~~,CAAC;~~YAE1B~~,IAAI,GAAG,IAAA,mBAAW,EAAC,YAAY,CAAC,CAAC;~~SACjC~~;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,sBAAc,EAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAE5D,MAAM,CAAC,IAAI,CAAC,IAAA,8BAAsB,EAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;QAE1E,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAa,CAAC;QAE3F,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,IAAA,oBAAY,EAAC,KAAK,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QAE7D,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;KAChC;IAED,OAAO,UAAU,CAAC,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;AAChD,CAAC;~~AAzDD~~,~~0BAyDC~~"}
1	+ {"version":3,"file":"insert.operation.js","sourceRoot":"","sources":["../../../../../../nodes/Postgres/v2/actions/database/insert.operation.ts"],"names":[],"mappings":"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"}

package/dist/nodes/Postgres/v2/actions/database/update.operation.js CHANGED Viewed

@@ -24,6 +24,11 @@ const properties = [
         ],
         default: 'autoMapInputData',
         description: 'Whether to map node input properties and the table data automatically or manually',
+        displayOptions: {
+            show: {
+                '@version': [2, 2.1],
+            },
+        },
     },
     {
         displayName: `
@@ -35,6 +40,7 @@ const properties = [
         displayOptions: {
             show: {
                 dataMode: ['autoMapInputData'],
+                '@version': [2],
             },
         },
     },
@@ -50,6 +56,11 @@ const properties = [
         },
         default: '',
         hint: 'The column that identifies the row(s) to modify',
+        displayOptions: {
+            show: {
+                '@version': [2, 2.1],
+            },
+        },
     },
     {
         displayName: 'Value of Column to Match On',
@@ -60,6 +71,7 @@ const properties = [
         displayOptions: {
             show: {
                 dataMode: ['defineBelow'],
+                '@version': [2, 2.1],
             },
         },
     },
@@ -75,6 +87,7 @@ const properties = [
         displayOptions: {
             show: {
                 dataMode: ['defineBelow'],
+                '@version': [2, 2.1],
             },
         },
         default: {},
@@ -104,6 +117,35 @@ const properties = [
             },
         ],
     },
+    {
+        displayName: 'Columns',
+        name: 'columns',
+        type: 'resourceMapper',
+        noDataExpression: true,
+        default: {
+            mappingMode: 'defineBelow',
+            value: null,
+        },
+        required: true,
+        typeOptions: {
+            loadOptionsDependsOn: ['table.value', 'operation'],
+            resourceMapper: {
+                resourceMapperMethod: 'getMappingColumns',
+                mode: 'update',
+                fieldWords: {
+                    singular: 'column',
+                    plural: 'columns',
+                },
+                addAllFields: true,
+                multiKeyMatch: true,
+            },
+        },
+        displayOptions: {
+            show: {
+                '@version': [2.2],
+            },
+        },
+    },
     common_descriptions_1.optionsCollection,
 ];
 const displayOptions = {
@@ -126,31 +168,84 @@ async function execute(runQueries, items, nodeOptions, db) {
         const table = this.getNodeParameter('table', i, undefined, {
             extractValue: true,
         });
-        const columnToMatchOn = this.getNodeParameter('columnToMatchOn', i);
-        const dataMode = this.getNodeParameter('dataMode', i);
+        const nodeVersion = this.getNode().typeVersion;
+        const columnsToMatchOn = nodeVersion < 2.2
+            ? [this.getNodeParameter('columnToMatchOn', i)]
+            : this.getNodeParameter('columns.matchingColumns', i);
+        const dataMode = nodeVersion < 2.2
+            ? this.getNodeParameter('dataMode', i)
+            : this.getNodeParameter('columns.mappingMode', i);
         let item = {};
         let valueToMatchOn = '';
+        if (nodeVersion < 2.2) {
+            valueToMatchOn = this.getNodeParameter('valueToMatchOn', i);
+        }
         if (dataMode === 'autoMapInputData') {
             item = items[i].json;
-            valueToMatchOn = item[columnToMatchOn];
+            if (nodeVersion < 2.2) {
+                valueToMatchOn = item[columnsToMatchOn[0]];
+            }
         }
         if (dataMode === 'defineBelow') {
-            const valuesToSend = this.getNodeParameter('valuesToSend', i, [])
-                .values;
-            item = (0, utils_1.prepareItem)(valuesToSend);
-            valueToMatchOn = this.getNodeParameter('valueToMatchOn', i);
+            const valuesToSend = nodeVersion < 2.2
+                ? this.getNodeParameter('valuesToSend', i, []).values
+                : this.getNodeParameter('columns.values', i, [])
+                    .values;
+            if (nodeVersion < 2.2) {
+                item = (0, utils_1.prepareItem)(valuesToSend);
+                item[columnsToMatchOn[0]] = this.getNodeParameter('valueToMatchOn', i);
+            }
+            else {
+                item = this.getNodeParameter('columns.value', i);
+            }
+        }
+        const matchValues = [];
+        if (nodeVersion < 2.2) {
+            if (!item[columnsToMatchOn[0]] && dataMode === 'autoMapInputData') {
+                throw new n8n_workflow_1.NodeOperationError(this.getNode(), "Column to match on not found in input item. Add a column to match on or set the 'Data Mode' to 'Define Below' to define the value to match on.");
+            }
+            matchValues.push(valueToMatchOn);
+            matchValues.push(columnsToMatchOn[0]);
         }
-        if (!item[columnToMatchOn] && dataMode === 'autoMapInputData') {
-            throw new n8n_workflow_1.NodeOperationError(this.getNode(), "Column to match on not found in input item. Add a column to match on or set the 'Data Mode' to 'Define Below' to define the value to match on.");
+        else {
+            columnsToMatchOn.forEach((column) => {
+                matchValues.push(column);
+                matchValues.push(item[column]);
+            });
+            const rowExists = await (0, utils_1.doesRowExist)(db, schema, table, matchValues);
+            if (!rowExists) {
+                const descriptionValues = [];
+                matchValues.forEach((val, index) => {
+                    if (index % 2 === 0) {
+                        descriptionValues.push(`${matchValues[index]}=${matchValues[index + 1]}`);
+                    }
+                });
+                throw new n8n_workflow_1.NodeOperationError(this.getNode(), "The row you are trying to update doesn't exist", {
+                    description: `No rows matching the provided values (${descriptionValues.join(', ')}) were found in the table "${table}".`,
+                    itemIndex: i,
+                });
+            }
         }
         const tableSchema = await (0, utils_1.getTableSchema)(db, schema, table);
         item = (0, utils_1.checkItemAgainstSchema)(this.getNode(), item, tableSchema, i);
         let values = [schema, table];
         let valuesLength = values.length + 1;
-        const condition = `$${valuesLength}:name = $${valuesLength + 1}`;
-        valuesLength = valuesLength + 2;
-        values.push(columnToMatchOn, valueToMatchOn);
-        const updateColumns = Object.keys(item).filter((column) => column !== columnToMatchOn);
+        let condition = '';
+        if (nodeVersion < 2.2) {
+            condition = `$${valuesLength}:name = $${valuesLength + 1}`;
+            valuesLength = valuesLength + 2;
+            values.push(columnsToMatchOn[0], valueToMatchOn);
+        }
+        else {
+            const conditions = [];
+            for (const column of columnsToMatchOn) {
+                conditions.push(`$${valuesLength}:name = $${valuesLength + 1}`);
+                valuesLength = valuesLength + 2;
+                values.push(column, item[column]);
+            }
+            condition = conditions.join(' AND ');
+        }
+        const updateColumns = Object.keys(item).filter((column) => !columnsToMatchOn.includes(column));
         if (!Object.keys(updateColumns).length) {
             throw new n8n_workflow_1.NodeOperationError(this.getNode(), "Add values to update to the input item or set the 'Data Mode' to 'Define Below' to define the values to update.");
         }
@@ -165,7 +260,8 @@ async function execute(runQueries, items, nodeOptions, db) {
         [query, values] = (0, utils_1.addReturning)(query, outputColumns, values);
         queries.push({ query, values });
     }
-    return runQueries(queries, items, nodeOptions);
+    const results = await runQueries(queries, items, nodeOptions);
+    return results;
 }
 exports.execute = execute;
 //# sourceMappingURL=update.operation.js.map

package/dist/nodes/Postgres/v2/actions/database/update.operation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update.operation.js","sourceRoot":"","sources":["../../../../../../nodes/Postgres/v2/actions/database/update.operation.ts"],"names":[],"mappings":";;;AAEA,+CAAkD;AAElD,8DAAsE;AAStE,+~~CAM6B~~;AAE7B,gEAA2D;AAE3D,MAAM,UAAU,GAAsB;IACrC;QACC,WAAW,EAAE,WAAW;QACxB,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE;YACR;gBACC,IAAI,EAAE,gCAAgC;gBACtC,KAAK,EAAE,kBAAkB;gBACzB,WAAW,EAAE,2EAA2E;aACxF;YACD;gBACC,IAAI,EAAE,0BAA0B;gBAChC,KAAK,EAAE,aAAa;gBACpB,WAAW,EAAE,oDAAoD;aACjE;SACD;QACD,OAAO,EAAE,kBAAkB;QAC3B,WAAW,EACV,mFAAmF;~~KACpF~~;IACD;QACC,WAAW,EAAE;;GAEZ;QACD,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,EAAE;QACX,cAAc,EAAE;YACf,IAAI,EAAE;gBACL,QAAQ,EAAE,CAAC,kBAAkB,CAAC;~~aAC9B~~;SACD;KACD;IACD;QAEC,WAAW,EAAE,oBAAoB;QACjC,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,IAAI;QACd,WAAW,EACV,iLAAiL;QAClL,WAAW,EAAE;YACZ,iBAAiB,EAAE,YAAY;YAC/B,oBAAoB,EAAE,CAAC,cAAc,EAAE,aAAa,CAAC;SACrD;QACD,OAAO,EAAE,EAAE;QACX,IAAI,EAAE,iDAAiD;~~KACvD~~;IACD;QACC,WAAW,EAAE,6BAA6B;QAC1C,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,EAAE;QACX,WAAW,EACV,qHAAqH;QACtH,cAAc,EAAE;YACf,IAAI,EAAE;gBACL,QAAQ,EAAE,CAAC,aAAa,CAAC;~~aACzB~~;SACD;KACD;IACD;QACC,WAAW,EAAE,gBAAgB;QAC7B,IAAI,EAAE,cAAc;QACpB,WAAW,EAAE,WAAW;QACxB,IAAI,EAAE,iBAAiB;QACvB,WAAW,EAAE;YACZ,uBAAuB,EAAE,WAAW;YACpC,cAAc,EAAE,IAAI;SACpB;QACD,cAAc,EAAE;YACf,IAAI,EAAE;gBACL,QAAQ,EAAE,CAAC,aAAa,CAAC;~~aACzB~~;SACD;QACD,OAAO,EAAE,EAAE;QACX,OAAO,EAAE;YACR;gBACC,WAAW,EAAE,QAAQ;gBACrB,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE;oBACP;wBAEC,WAAW,EAAE,QAAQ;wBACrB,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,SAAS;wBACf,WAAW,EACV,yHAAyH;wBAC1H,WAAW,EAAE;4BACZ,iBAAiB,EAAE,kCAAkC;4BACrD,oBAAoB,EAAE,CAAC,cAAc,EAAE,aAAa,CAAC;yBACrD;wBACD,OAAO,EAAE,EAAE;qBACX;oBACD;wBACC,WAAW,EAAE,OAAO;wBACpB,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,QAAQ;wBACd,OAAO,EAAE,EAAE;qBACX;iBACD;aACD;SACD;KACD;IACD,uCAAiB;CACjB,CAAC;AAEF,MAAM,cAAc,GAAG;IACtB,IAAI,EAAE;QACL,QAAQ,EAAE,CAAC,UAAU,CAAC;QACtB,SAAS,EAAE,CAAC,QAAQ,CAAC;KACrB;IACD,IAAI,EAAE;QACL,KAAK,EAAE,CAAC,EAAE,CAAC;KACX;CACD,CAAC;AAEW,QAAA,WAAW,GAAG,IAAA,gCAAoB,EAAC,cAAc,EAAE,UAAU,CAAC,CAAC;AAErE,KAAK,UAAU,OAAO,CAE5B,UAAyB,EACzB,KAA2B,EAC3B,WAAwB,EACxB,EAAe;IAEf,KAAK,GAAG,IAAA,kCAA0B,EAAC,KAAK,EAAE,WAAW,CAAC,mBAA8B,CAAC,CAAC;IAEtF,MAAM,OAAO,GAAsB,EAAE,CAAC;IAEtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE;YAC5D,YAAY,EAAE,IAAI;SAClB,CAAW,CAAC;QAEb,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE;YAC1D,YAAY,EAAE,IAAI;SAClB,CAAW,CAAC;QAEb,MAAM,~~eAAe~~,GAAG,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAW,CAAC;~~QAE9E~~,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,CAAC,~~CAAW~~,CAAC;QAEhE,IAAI,IAAI,GAAgB,EAAE,CAAC;QAC3B,IAAI,cAAc,GAAyB,EAAE,CAAC;~~QAE9C~~,IAAI,QAAQ,KAAK,kBAAkB,EAAE;YACpC,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACrB,cAAc,GAAG,IAAI,CAAC,~~eAAe~~,CAAW,CAAC;~~SACjD~~;QAED,IAAI,QAAQ,KAAK,aAAa,EAAE;YAC/B,MAAM,YAAY,~~GAAI~~,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,CAAC,EAAE,EAAE,CAAiB;~~iBAChF~~,~~MAAuB~~,CAAC;~~YAE1B~~,IAAI,GAAG,IAAA,mBAAW,EAAC,YAAY,CAAC,CAAC;~~YAEjC~~,~~cAAc~~,GAAG,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,CAAC,CAAW,CAAC;~~SACtE~~;QAED,IAAI,CAAC,IAAI,CAAC,~~eAAe~~,CAAC,IAAI,QAAQ,KAAK,kBAAkB,EAAE;~~YAC9D~~,MAAM,IAAI,iCAAkB,CAC3B,IAAI,CAAC,OAAO,EAAE,EACd,gJAAgJ,CAChJ,CAAC;~~SACF~~;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,sBAAc,EAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAE5D,IAAI,GAAG,IAAA,8BAAsB,EAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;QAEpE,IAAI,MAAM,GAAgB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAE1C,IAAI,YAAY,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QAErC,~~MAAM~~,SAAS,GAAG,IAAI,YAAY,YAAY,YAAY,GAAG,CAAC,EAAE,CAAC;~~QACjE~~,YAAY,GAAG,YAAY,GAAG,CAAC,CAAC;~~QAChC~~,MAAM,CAAC,IAAI,CAAC,~~eAAe~~,EAAE,cAAc,CAAC,CAAC;~~QAE7C~~,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,~~MAAM~~,~~KAAK~~,~~eAAe~~,CAAC,CAAC;~~QAEvF~~,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE;YACvC,MAAM,IAAI,iCAAkB,CAC3B,IAAI,CAAC,OAAO,EAAE,EACd,iHAAiH,CACjH,CAAC;SACF;QAED,MAAM,OAAO,GAAa,EAAE,CAAC;QAE7B,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE;YACnC,OAAO,CAAC,IAAI,CAAC,IAAI,YAAY,YAAY,YAAY,GAAG,CAAC,EAAE,CAAC,CAAC;YAC7D,YAAY,GAAG,YAAY,GAAG,CAAC,CAAC;YAChC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAW,CAAC,CAAC;SAC5C;QAED,IAAI,KAAK,GAAG,8BAA8B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,SAAS,EAAE,CAAC;QAElF,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAa,CAAC;QAE3F,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,IAAA,oBAAY,EAAC,KAAK,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QAE7D,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;KAChC;IAED,OAAO,UAAU,CAAC,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;~~AAChD~~,CAAC;~~AAvFD~~,~~0BAuFC~~"}
1	+ {"version":3,"file":"update.operation.js","sourceRoot":"","sources":["../../../../../../nodes/Postgres/v2/actions/database/update.operation.ts"],"names":[],"mappings":"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"}

package/dist/nodes/Postgres/v2/actions/database/upsert.operation.js CHANGED Viewed

@@ -24,6 +24,11 @@ const properties = [
         ],
         default: 'autoMapInputData',
         description: 'Whether to map node input properties and the table data automatically or manually',
+        displayOptions: {
+            show: {
+                '@version': [2, 2.1],
+            },
+        },
     },
     {
         displayName: `
@@ -35,11 +40,12 @@ const properties = [
         displayOptions: {
             show: {
                 dataMode: ['autoMapInputData'],
+                '@version': [2, 2.1],
             },
         },
     },
     {
-        displayName: 'Column to Match On',
+        displayName: 'Unique Column',
         name: 'columnToMatchOn',
         type: 'options',
         required: true,
@@ -50,9 +56,14 @@ const properties = [
         },
         default: '',
         hint: "Used to find the correct row(s) to update. Doesn't get changed. Has to be unique.",
+        displayOptions: {
+            show: {
+                '@version': [2, 2.1],
+            },
+        },
     },
     {
-        displayName: 'Value of Column to Match On',
+        displayName: 'Value of Unique Column',
         name: 'valueToMatchOn',
         type: 'string',
         default: '',
@@ -60,6 +71,7 @@ const properties = [
         displayOptions: {
             show: {
                 dataMode: ['defineBelow'],
+                '@version': [2, 2.1],
             },
         },
     },
@@ -75,6 +87,7 @@ const properties = [
         displayOptions: {
             show: {
                 dataMode: ['defineBelow'],
+                '@version': [2, 2.1],
             },
         },
         default: {},
@@ -104,6 +117,35 @@ const properties = [
             },
         ],
     },
+    {
+        displayName: 'Columns',
+        name: 'columns',
+        type: 'resourceMapper',
+        noDataExpression: true,
+        default: {
+            mappingMode: 'defineBelow',
+            value: null,
+        },
+        required: true,
+        typeOptions: {
+            loadOptionsDependsOn: ['table.value', 'operation'],
+            resourceMapper: {
+                resourceMapperMethod: 'getMappingColumns',
+                mode: 'upsert',
+                fieldWords: {
+                    singular: 'column',
+                    plural: 'columns',
+                },
+                addAllFields: true,
+                multiKeyMatch: true,
+            },
+        },
+        displayOptions: {
+            show: {
+                '@version': [2.2],
+            },
+        },
+    },
     common_descriptions_1.optionsCollection,
 ];
 const displayOptions = {
@@ -126,35 +168,51 @@ async function execute(runQueries, items, nodeOptions, db) {
         const table = this.getNodeParameter('table', i, undefined, {
             extractValue: true,
         });
-        const columnToMatchOn = this.getNodeParameter('columnToMatchOn', i);
-        const dataMode = this.getNodeParameter('dataMode', i);
+        const nodeVersion = this.getNode().typeVersion;
+        const columnsToMatchOn = nodeVersion < 2.2
+            ? [this.getNodeParameter('columnToMatchOn', i)]
+            : this.getNodeParameter('columns.matchingColumns', i);
+        const dataMode = nodeVersion < 2.2
+            ? this.getNodeParameter('dataMode', i)
+            : this.getNodeParameter('columns.mappingMode', i);
         let item = {};
         if (dataMode === 'autoMapInputData') {
             item = items[i].json;
         }
         if (dataMode === 'defineBelow') {
-            const valuesToSend = this.getNodeParameter('valuesToSend', i, [])
-                .values;
-            item = (0, utils_1.prepareItem)(valuesToSend);
-            item[columnToMatchOn] = this.getNodeParameter('valueToMatchOn', i);
+            const valuesToSend = nodeVersion < 2.2
+                ? this.getNodeParameter('valuesToSend', i, []).values
+                : this.getNodeParameter('columns.values', i, [])
+                    .values;
+            if (nodeVersion < 2.2) {
+                item = (0, utils_1.prepareItem)(valuesToSend);
+                item[columnsToMatchOn[0]] = this.getNodeParameter('valueToMatchOn', i);
+            }
+            else {
+                item = this.getNodeParameter('columns.value', i);
+            }
         }
-        if (!item[columnToMatchOn]) {
+        if (!item[columnsToMatchOn[0]]) {
             throw new n8n_workflow_1.NodeOperationError(this.getNode(), "Column to match on not found in input item. Add a column to match on or set the 'Data Mode' to 'Define Below' to define the value to match on.");
         }
-        if (item[columnToMatchOn] && Object.keys(item).length === 1) {
+        if (item[columnsToMatchOn[0]] && Object.keys(item).length === 1) {
             throw new n8n_workflow_1.NodeOperationError(this.getNode(), "Add values to update or insert to the input item or set the 'Data Mode' to 'Define Below' to define the values to insert or update.");
         }
         const tableSchema = await (0, utils_1.getTableSchema)(db, schema, table);
         item = (0, utils_1.checkItemAgainstSchema)(this.getNode(), item, tableSchema, i);
         let values = [schema, table];
         let valuesLength = values.length + 1;
-        const onConflict = ` ON CONFLICT ($${valuesLength}:name) DO UPDATE `;
-        valuesLength = valuesLength + 1;
-        values.push(columnToMatchOn);
+        const conflictColumns = [];
+        columnsToMatchOn.forEach((column) => {
+            conflictColumns.push(`$${valuesLength}:name`);
+            valuesLength = valuesLength + 1;
+            values.push(column);
+        });
+        const onConflict = ` ON CONFLICT (${conflictColumns.join(',')}) DO UPDATE `;
         const insertQuery = `INSERT INTO $1:name.$2:name($${valuesLength}:name) VALUES($${valuesLength}:csv)${onConflict}`;
         valuesLength = valuesLength + 1;
         values.push(item);
-        const updateColumns = Object.keys(item).filter((column) => column !== columnToMatchOn);
+        const updateColumns = Object.keys(item).filter((column) => !columnsToMatchOn.includes(column));
         const updates = [];
         for (const column of updateColumns) {
             updates.push(`$${valuesLength}:name = $${valuesLength + 1}`);

package/dist/nodes/Postgres/v2/actions/database/upsert.operation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"upsert.operation.js","sourceRoot":"","sources":["../../../../../../nodes/Postgres/v2/actions/database/upsert.operation.ts"],"names":[],"mappings":";;;AAEA,+CAAkD;AAElD,8DAAsE;AAStE,+CAM6B;AAE7B,gEAA2D;AAE3D,MAAM,UAAU,GAAsB;IACrC;QACC,WAAW,EAAE,WAAW;QACxB,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE;YACR;gBACC,IAAI,EAAE,gCAAgC;gBACtC,KAAK,EAAE,kBAAkB;gBACzB,WAAW,EAAE,2EAA2E;aACxF;YACD;gBACC,IAAI,EAAE,0BAA0B;gBAChC,KAAK,EAAE,aAAa;gBACpB,WAAW,EAAE,oDAAoD;aACjE;SACD;QACD,OAAO,EAAE,kBAAkB;QAC3B,WAAW,EACV,mFAAmF;~~KACpF~~;IACD;QACC,WAAW,EAAE;;GAEZ;QACD,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,EAAE;QACX,cAAc,EAAE;YACf,IAAI,EAAE;gBACL,QAAQ,EAAE,CAAC,kBAAkB,CAAC;~~aAC9B~~;SACD;KACD;IACD;QAEC,WAAW,EAAE,~~oBAAoB~~;~~QACjC~~,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,IAAI;QACd,WAAW,EACV,iLAAiL;QAClL,WAAW,EAAE;YACZ,iBAAiB,EAAE,YAAY;YAC/B,oBAAoB,EAAE,CAAC,cAAc,EAAE,aAAa,CAAC;SACrD;QACD,OAAO,EAAE,EAAE;QACX,IAAI,EAAE,mFAAmF;~~KACzF~~;IACD;QACC,WAAW,EAAE,~~6BAA6B~~;~~QAC1C~~,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,EAAE;QACX,WAAW,EACV,uKAAuK;QACxK,cAAc,EAAE;YACf,IAAI,EAAE;gBACL,QAAQ,EAAE,CAAC,aAAa,CAAC;~~aACzB~~;SACD;KACD;IACD;QACC,WAAW,EAAE,gBAAgB;QAC7B,IAAI,EAAE,cAAc;QACpB,WAAW,EAAE,WAAW;QACxB,IAAI,EAAE,iBAAiB;QACvB,WAAW,EAAE;YACZ,uBAAuB,EAAE,WAAW;YACpC,cAAc,EAAE,IAAI;SACpB;QACD,cAAc,EAAE;YACf,IAAI,EAAE;gBACL,QAAQ,EAAE,CAAC,aAAa,CAAC;~~aACzB~~;SACD;QACD,OAAO,EAAE,EAAE;QACX,OAAO,EAAE;YACR;gBACC,WAAW,EAAE,QAAQ;gBACrB,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE;oBACP;wBAEC,WAAW,EAAE,QAAQ;wBACrB,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,SAAS;wBACf,WAAW,EACV,yHAAyH;wBAC1H,WAAW,EAAE;4BACZ,iBAAiB,EAAE,kCAAkC;4BACrD,oBAAoB,EAAE,CAAC,cAAc,EAAE,aAAa,CAAC;yBACrD;wBACD,OAAO,EAAE,EAAE;qBACX;oBACD;wBACC,WAAW,EAAE,OAAO;wBACpB,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,QAAQ;wBACd,OAAO,EAAE,EAAE;qBACX;iBACD;aACD;SACD;KACD;IACD,uCAAiB;CACjB,CAAC;AAEF,MAAM,cAAc,GAAG;IACtB,IAAI,EAAE;QACL,QAAQ,EAAE,CAAC,UAAU,CAAC;QACtB,SAAS,EAAE,CAAC,QAAQ,CAAC;KACrB;IACD,IAAI,EAAE;QACL,KAAK,EAAE,CAAC,EAAE,CAAC;KACX;CACD,CAAC;AAEW,QAAA,WAAW,GAAG,IAAA,gCAAoB,EAAC,cAAc,EAAE,UAAU,CAAC,CAAC;AAErE,KAAK,UAAU,OAAO,CAE5B,UAAyB,EACzB,KAA2B,EAC3B,WAAwB,EACxB,EAAe;IAEf,KAAK,GAAG,IAAA,kCAA0B,EAAC,KAAK,EAAE,WAAW,CAAC,mBAA8B,CAAC,CAAC;IAEtF,MAAM,OAAO,GAAsB,EAAE,CAAC;IAEtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE;YAC5D,YAAY,EAAE,IAAI;SAClB,CAAW,CAAC;QAEb,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE;YAC1D,YAAY,EAAE,IAAI;SAClB,CAAW,CAAC;QAEb,MAAM,~~eAAe~~,GAAG,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAW,CAAC;~~QAE9E~~,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,CAAC,~~CAAW~~,CAAC;QAEhE,IAAI,IAAI,GAAgB,EAAE,CAAC;QAE3B,IAAI,QAAQ,KAAK,kBAAkB,EAAE;YACpC,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;SACrB;QAED,IAAI,QAAQ,KAAK,aAAa,EAAE;YAC/B,MAAM,YAAY,~~GAAI~~,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,CAAC,EAAE,EAAE,CAAiB;~~iBAChF~~,~~MAAuB~~,CAAC;~~YAE1B~~,IAAI,GAAG,IAAA,mBAAW,EAAC,YAAY,CAAC,CAAC;~~YAEjC~~,IAAI,CAAC,~~eAAe~~,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,CAAC,CAAW,CAAC;~~SAC7E~~;QAED,IAAI,CAAC,IAAI,CAAC,~~eAAe~~,CAAC,EAAE;~~YAC3B~~,MAAM,IAAI,iCAAkB,CAC3B,IAAI,CAAC,OAAO,EAAE,EACd,gJAAgJ,CAChJ,CAAC;SACF;QAED,IAAI,IAAI,CAAC,~~eAAe~~,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;~~YAC5D~~,MAAM,IAAI,iCAAkB,CAC3B,IAAI,CAAC,OAAO,EAAE,EACd,qIAAqI,CACrI,CAAC;SACF;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,sBAAc,EAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAE5D,IAAI,GAAG,IAAA,8BAAsB,EAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;QAEpE,IAAI,MAAM,GAAgB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAE1C,IAAI,YAAY,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QACrC,MAAM,~~UAAU~~,~~GAAG~~,~~kBAAkB~~,YAAY,~~mBAAmB~~,CAAC;~~QACrE~~,YAAY,GAAG,YAAY,GAAG,CAAC,CAAC;~~QAChC~~,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;~~QAE7B~~,MAAM,WAAW,GAAG,gCAAgC,YAAY,kBAAkB,YAAY,QAAQ,UAAU,EAAE,CAAC;QACnH,YAAY,GAAG,YAAY,GAAG,CAAC,CAAC;QAChC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAElB,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,~~MAAM~~,~~KAAK~~,~~eAAe~~,CAAC,CAAC;~~QAEvF~~,MAAM,OAAO,GAAa,EAAE,CAAC;QAE7B,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE;YACnC,OAAO,CAAC,IAAI,CAAC,IAAI,YAAY,YAAY,YAAY,GAAG,CAAC,EAAE,CAAC,CAAC;YAC7D,YAAY,GAAG,YAAY,GAAG,CAAC,CAAC;YAChC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAW,CAAC,CAAC;SAC5C;QAED,IAAI,KAAK,GAAG,GAAG,WAAW,QAAQ,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAEvD,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAa,CAAC;QAE3F,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,IAAA,oBAAY,EAAC,KAAK,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QAE7D,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;KAChC;IAED,OAAO,UAAU,CAAC,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;AAChD,CAAC;~~AAxFD~~,~~0BAwFC~~"}
1	+ {"version":3,"file":"upsert.operation.js","sourceRoot":"","sources":["../../../../../../nodes/Postgres/v2/actions/database/upsert.operation.ts"],"names":[],"mappings":"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"}

package/dist/nodes/Postgres/v2/actions/versionDescription.js CHANGED Viewed

@@ -30,7 +30,7 @@ exports.versionDescription = {
     name: 'postgres',
     icon: 'file:postgres.svg',
     group: ['input'],
-    version: [2, 2.1],
+    version: [2, 2.1, 2.2],
     subtitle: '={{ $parameter["operation"] }}',
     description: 'Get, add and update data in Postgres',
     defaults: {

package/dist/nodes/Postgres/v2/actions/versionDescription.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"versionDescription.js","sourceRoot":"","sources":["../../../../../nodes/Postgres/v2/actions/versionDescription.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,uEAAyD;AAE5C,QAAA,kBAAkB,GAAyB;IACvD,WAAW,EAAE,UAAU;IACvB,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,mBAAmB;IACzB,KAAK,EAAE,CAAC,OAAO,CAAC;IAChB,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC;~~IACjB~~,QAAQ,EAAE,gCAAgC;IAC1C,WAAW,EAAE,sCAAsC;IACnD,QAAQ,EAAE;QACT,IAAI,EAAE,UAAU;KAChB;IACD,MAAM,EAAE,CAAC,MAAM,CAAC;IAChB,OAAO,EAAE,CAAC,MAAM,CAAC;IACjB,WAAW,EAAE;QACZ;YACC,IAAI,EAAE,UAAU;YAChB,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,wBAAwB;SAClC;KACD;IACD,UAAU,EAAE;QACX;YACC,WAAW,EAAE,UAAU;YACvB,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,QAAQ;YACd,gBAAgB,EAAE,IAAI;YACtB,OAAO,EAAE;gBACR;oBACC,IAAI,EAAE,UAAU;oBAChB,KAAK,EAAE,UAAU;iBACjB;aACD;YACD,OAAO,EAAE,UAAU;SACnB;QACD,GAAG,QAAQ,CAAC,WAAW;KACvB;CACD,CAAC"}
1	+ {"version":3,"file":"versionDescription.js","sourceRoot":"","sources":["../../../../../nodes/Postgres/v2/actions/versionDescription.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,uEAAyD;AAE5C,QAAA,kBAAkB,GAAyB;IACvD,WAAW,EAAE,UAAU;IACvB,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,mBAAmB;IACzB,KAAK,EAAE,CAAC,OAAO,CAAC;IAChB,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC;IACtB,QAAQ,EAAE,gCAAgC;IAC1C,WAAW,EAAE,sCAAsC;IACnD,QAAQ,EAAE;QACT,IAAI,EAAE,UAAU;KAChB;IACD,MAAM,EAAE,CAAC,MAAM,CAAC;IAChB,OAAO,EAAE,CAAC,MAAM,CAAC;IACjB,WAAW,EAAE;QACZ;YACC,IAAI,EAAE,UAAU;YAChB,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,wBAAwB;SAClC;KACD;IACD,UAAU,EAAE;QACX;YACC,WAAW,EAAE,UAAU;YACvB,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,QAAQ;YACd,gBAAgB,EAAE,IAAI;YACtB,OAAO,EAAE;gBACR;oBACC,IAAI,EAAE,UAAU;oBAChB,KAAK,EAAE,UAAU;iBACjB;aACD;YACD,OAAO,EAAE,UAAU;SACnB;QACD,GAAG,QAAQ,CAAC,WAAW;KACvB;CACD,CAAC"}

package/dist/nodes/Postgres/v2/helpers/interfaces.d.ts CHANGED Viewed

@@ -22,6 +22,12 @@ export type ColumnInfo = {
     column_name: string;
     data_type: string;
     is_nullable: string;
+    udt_name: string;
+    column_default?: string;
+};
+export type EnumInfo = {
+    typname: string;
+    enumlabel: string;
 };
 export type PgpClient = pgPromise.IMain<{}, pg.IClient>;
 export type PgpDatabase = pgPromise.IDatabase<{}, pg.IClient>;

package/dist/nodes/Postgres/v2/helpers/utils.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
-import type { IDataObject, INode, INodeExecutionData } from 'n8n-workflow';
+import type { IDataObject, INode, INodeExecutionData, INodePropertyOptions } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import type { ColumnInfo, ConstructExecutionMetaData, PgpClient, PgpDatabase, QueryValues, QueryWithValues, SortRule, WhereClause } from './interfaces';
+import type { ColumnInfo, ConstructExecutionMetaData, EnumInfo, PgpClient, PgpDatabase, QueryValues, QueryWithValues, SortRule, WhereClause } from './interfaces';
 export declare function wrapData(data: IDataObject | IDataObject[]): INodeExecutionData[];
 export declare function prepareErrorItem(items: INodeExecutionData[], error: IDataObject | NodeOperationError | Error, index: number): INodeExecutionData;
 export declare function parsePostgresError(node: INode, error: any, queries: QueryWithValues[], itemIndex?: number): NodeOperationError;
@@ -27,4 +27,8 @@ export declare const configureQueryRunner: (node: INode, constructExecutionMetaD
 export declare function replaceEmptyStringsByNulls(items: INodeExecutionData[], replace?: boolean): INodeExecutionData[];
 export declare function prepareItem(values: IDataObject[]): IDataObject;
 export declare function getTableSchema(db: PgpDatabase, schema: string, table: string): Promise<ColumnInfo[]>;
+export declare function uniqueColumns(db: PgpDatabase, table: string): Promise<IDataObject[]>;
+export declare function getEnums(db: PgpDatabase): Promise<EnumInfo[]>;
+export declare function getEnumValues(enumInfo: EnumInfo[], enumName: string): INodePropertyOptions[];
+export declare function doesRowExist(db: PgpDatabase, schema: string, table: string, values: string[]): Promise<boolean>;
 export declare function checkItemAgainstSchema(node: INode, item: IDataObject, columnsInfo: ColumnInfo[], index: number): IDataObject;

package/dist/nodes/Postgres/v2/helpers/utils.js CHANGED Viewed

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkItemAgainstSchema = exports.getTableSchema = exports.prepareItem = exports.replaceEmptyStringsByNulls = exports.configureQueryRunner = exports.addReturning = exports.addSortRules = exports.addWhereClauses = exports.parsePostgresError = exports.prepareErrorItem = exports.wrapData = void 0;
+exports.checkItemAgainstSchema = exports.doesRowExist = exports.getEnumValues = exports.getEnums = exports.uniqueColumns = exports.getTableSchema = exports.prepareItem = exports.replaceEmptyStringsByNulls = exports.configureQueryRunner = exports.addReturning = exports.addSortRules = exports.addWhereClauses = exports.parsePostgresError = exports.prepareErrorItem = exports.wrapData = void 0;
 const n8n_workflow_1 = require("n8n-workflow");
+const ENUM_VALUES_REGEX = /\{(.+?)\}/gm;
 function wrapData(data) {
     if (!Array.isArray(data)) {
         return [{ json: data }];
@@ -228,10 +229,43 @@ function prepareItem(values) {
 }
 exports.prepareItem = prepareItem;
 async function getTableSchema(db, schema, table) {
-    const columns = await db.any('SELECT column_name, data_type, is_nullable FROM information_schema.columns WHERE table_schema = $1 AND table_name = $2', [schema, table]);
+    const columns = await db.any('SELECT column_name, data_type, is_nullable, udt_name, column_default FROM information_schema.columns WHERE table_schema = $1 AND table_name = $2', [schema, table]);
     return columns;
 }
 exports.getTableSchema = getTableSchema;
+async function uniqueColumns(db, table) {
+    const unique = await db.any(`
+		SELECT DISTINCT a.attname
+			FROM pg_index i JOIN pg_attribute a ON a.attrelid = i.indrelid AND a.attnum = ANY(i.indkey)
+		WHERE i.indrelid = quote_ident($1)::regclass
+			AND (i.indisprimary OR i.indisunique);
+		`, [table]);
+    return unique;
+}
+exports.uniqueColumns = uniqueColumns;
+async function getEnums(db) {
+    const enumsData = await db.any('SELECT pg_type.typname, pg_enum.enumlabel FROM pg_type JOIN pg_enum ON pg_enum.enumtypid = pg_type.oid;');
+    return enumsData;
+}
+exports.getEnums = getEnums;
+function getEnumValues(enumInfo, enumName) {
+    return enumInfo.reduce((acc, current) => {
+        if (current.typname === enumName) {
+            acc.push({ name: current.enumlabel, value: current.enumlabel });
+        }
+        return acc;
+    }, []);
+}
+exports.getEnumValues = getEnumValues;
+async function doesRowExist(db, schema, table, values) {
+    const where = [];
+    for (let i = 3; i < 3 + values.length; i += 2) {
+        where.push(`$${i}:name=$${i + 1}`);
+    }
+    const exists = await db.any(`SELECT EXISTS(SELECT 1 FROM $1:name.$2:name WHERE ${where.join(' AND ')})`, [schema, table, ...values]);
+    return exists[0].exists;
+}
+exports.doesRowExist = doesRowExist;
 function checkItemAgainstSchema(node, item, columnsInfo, index) {
     var _a;
     if (columnsInfo.length === 0)