@fachkraftfreund/n8n-nodes-supabase 1.3.4 → 1.3.6

package/dist/nodes/Supabase/Supabase.node.js

@@ -341,6 +341,19 @@ class Supabase {
                         },
                     },
                 },
+                {
+                    displayName: 'Remove Duplicate Rows',
+                    name: 'deduplicateByConflict',
+                    type: 'boolean',
+                    default: false,
+                    description: 'When enabled, removes duplicate rows by the conflict/match column(s) before sending to Supabase. Keeps the last occurrence. Prevents the "ON CONFLICT DO UPDATE command cannot affect row a second time" error.',
+                    displayOptions: {
+                        show: {
+                            resource: ['database'],
+                            operation: ['upsert', 'update'],
+                        },
+                    },
+                },
                 {
                     displayName: 'Match Column',
                     name: 'matchColumn',

package/dist/nodes/Supabase/operations/database/index.js

@@ -55,7 +55,6 @@ exports.executeDatabaseOperation = executeDatabaseOperation;
 const BULK_BATCH_SIZE = 500;
 const MAX_RETRIES = 3;
 const RETRY_BASE_DELAY_MS = 1000;
-const DUPLICATE_ROW_ERROR = 'cannot affect row a second time';
 function deduplicateByConflictKeys(rows, conflictColumns) {
     const keys = conflictColumns.split(',').map((k) => k.trim()).filter(Boolean);
     if (keys.length === 0)
@@ -205,32 +204,30 @@ async function handleBulkUpsert(supabase, itemCount) {
     const table = this.getNodeParameter('table', 0);
     const onConflict = this.getNodeParameter('onConflict', 0, '');
     (0, supabaseClient_1.validateTableName)(table);
-    const rows = collectRowData(this, itemCount);
+    const deduplicate = this.getNodeParameter('deduplicateByConflict', 0, false);
+    let rows = collectRowData(this, itemCount);
     const options = {};
-    if (onConflict)
+    if (onConflict) {
         options.onConflict = onConflict;
+        if (deduplicate) {
+            const before = rows.length;
+            rows = deduplicateByConflictKeys(rows, onConflict);
+            if (rows.length < before) {
+                console.log(`[Supabase UPSERT ${table}] deduplicated input: ${before} → ${rows.length} rows by conflict key "${onConflict}"`);
+            }
+        }
+    }
     const returnData = [];
     for (let offset = 0; offset < rows.length; offset += BULK_BATCH_SIZE) {
-        let batch = rows.slice(offset, offset + BULK_BATCH_SIZE);
+        const batch = rows.slice(offset, offset + BULK_BATCH_SIZE);
         const batchLabel = `UPSERT ${table} batch ${Math.floor(offset / BULK_BATCH_SIZE) + 1}`;
         const data = await withRetry(async () => {
             const { data, error } = await supabase
                 .from(table)
                 .upsert(batch, options)
                 .select();
-            if (error) {
-                const msg = (0, supabaseClient_1.formatSupabaseError)(error);
-                if (msg.toLowerCase().includes(DUPLICATE_ROW_ERROR) && onConflict) {
-                    const before = batch.length;
-                    batch = deduplicateByConflictKeys(batch, onConflict);
-                    console.log(`[Supabase ${batchLabel}] removed ${before - batch.length} duplicate(s) by conflict key "${onConflict}", retrying ${batch.length} rows`);
-                    const retry = await supabase.from(table).upsert(batch, options).select();
-                    if (retry.error)
-                        throw new Error((0, supabaseClient_1.formatSupabaseError)(retry.error));
-                    return retry.data;
-                }
-                throw new Error(msg);
-            }
+            if (error)
+                throw new Error((0, supabaseClient_1.formatSupabaseError)(error));
             return data;
         }, batchLabel);
         if (Array.isArray(data)) {
@@ -249,35 +246,32 @@ async function handleBulkUpdate(supabase, itemCount) {
     if (!matchColumn) {
         throw new Error('Match Column is required for update operations');
     }
-    const rows = collectRowData(this, itemCount);
+    const deduplicate = this.getNodeParameter('deduplicateByConflict', 0, false);
+    let rows = collectRowData(this, itemCount);
     for (let i = 0; i < rows.length; i++) {
         const row = rows[i];
         if (!row || row[matchColumn] === undefined) {
             throw new Error(`Item ${i} is missing the match column "${matchColumn}"`);
         }
     }
+    if (deduplicate) {
+        const before = rows.length;
+        rows = deduplicateByConflictKeys(rows, matchColumn);
+        if (rows.length < before) {
+            console.log(`[Supabase UPDATE ${table}] deduplicated input: ${before} → ${rows.length} rows by match column "${matchColumn}"`);
+        }
+    }
     const returnData = [];
     for (let offset = 0; offset < rows.length; offset += BULK_BATCH_SIZE) {
-        let batch = rows.slice(offset, offset + BULK_BATCH_SIZE);
+        const batch = rows.slice(offset, offset + BULK_BATCH_SIZE);
         const batchLabel = `UPDATE ${table} batch ${Math.floor(offset / BULK_BATCH_SIZE) + 1}`;
         const data = await withRetry(async () => {
             const { data, error } = await supabase
                 .from(table)
                 .upsert(batch, { onConflict: matchColumn })
                 .select();
-            if (error) {
-                const msg = (0, supabaseClient_1.formatSupabaseError)(error);
-                if (msg.toLowerCase().includes(DUPLICATE_ROW_ERROR)) {
-                    const before = batch.length;
-                    batch = deduplicateByConflictKeys(batch, matchColumn);
-                    console.log(`[Supabase ${batchLabel}] removed ${before - batch.length} duplicate(s) by match column "${matchColumn}", retrying ${batch.length} rows`);
-                    const retry = await supabase.from(table).upsert(batch, { onConflict: matchColumn }).select();
-                    if (retry.error)
-                        throw new Error((0, supabaseClient_1.formatSupabaseError)(retry.error));
-                    return retry.data;
-                }
-                throw new Error(msg);
-            }
+            if (error)
+                throw new Error((0, supabaseClient_1.formatSupabaseError)(error));
             return data;
         }, batchLabel);
         if (Array.isArray(data)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fachkraftfreund/n8n-nodes-supabase",
-  "version": "1.3.4",
+  "version": "1.3.6",
   "description": "Comprehensive n8n community node for Supabase with database and storage operations",
   "keywords": [
     "n8n-community-node-package",