@fachkraftfreund/n8n-nodes-supabase 1.3.6 → 1.3.8

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

@@ -203,31 +203,41 @@ async function handleBulkCreate(supabase, itemCount) {
 async function handleBulkUpsert(supabase, itemCount) {
     const table = this.getNodeParameter('table', 0);
     const onConflict = this.getNodeParameter('onConflict', 0, '');
-    (0, supabaseClient_1.validateTableName)(table);
     const deduplicate = this.getNodeParameter('deduplicateByConflict', 0, false);
+    (0, supabaseClient_1.validateTableName)(table);
     let rows = collectRowData(this, itemCount);
+    console.log(`[Supabase UPSERT ${table}] rows=${rows.length}, onConflict="${onConflict}", deduplicate=${deduplicate}`);
     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}"`);
-            }
-        }
+    if (deduplicate && onConflict) {
+        const before = rows.length;
+        rows = deduplicateByConflictKeys(rows, onConflict);
+        console.log(`[Supabase UPSERT ${table}] dedup by "${onConflict}": ${before} → ${rows.length} rows`);
     }
     const returnData = [];
+    const duplicateError = 'cannot affect row a second time';
     for (let offset = 0; offset < rows.length; offset += BULK_BATCH_SIZE) {
-        const batch = rows.slice(offset, offset + BULK_BATCH_SIZE);
+        let 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)
-                throw new Error((0, supabaseClient_1.formatSupabaseError)(error));
+            if (error) {
+                const msg = (0, supabaseClient_1.formatSupabaseError)(error);
+                if (msg.toLowerCase().includes(duplicateError) && onConflict) {
+                    const before = batch.length;
+                    batch = deduplicateByConflictKeys(batch, onConflict);
+                    console.log(`[Supabase ${batchLabel}] duplicate-row error caught, dedup fallback: ${before} → ${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);
+            }
             return data;
         }, batchLabel);
         if (Array.isArray(data)) {
@@ -248,6 +258,7 @@ async function handleBulkUpdate(supabase, itemCount) {
     }
     const deduplicate = this.getNodeParameter('deduplicateByConflict', 0, false);
     let rows = collectRowData(this, itemCount);
+    console.log(`[Supabase UPDATE ${table}] rows=${rows.length}, matchColumn="${matchColumn}", deduplicate=${deduplicate}`);
     for (let i = 0; i < rows.length; i++) {
         const row = rows[i];
         if (!row || row[matchColumn] === undefined) {
@@ -257,21 +268,31 @@ async function handleBulkUpdate(supabase, itemCount) {
     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}"`);
-        }
+        console.log(`[Supabase UPDATE ${table}] dedup by "${matchColumn}": ${before} → ${rows.length} rows`);
     }
     const returnData = [];
+    const duplicateError = 'cannot affect row a second time';
     for (let offset = 0; offset < rows.length; offset += BULK_BATCH_SIZE) {
-        const batch = rows.slice(offset, offset + BULK_BATCH_SIZE);
+        let 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)
-                throw new Error((0, supabaseClient_1.formatSupabaseError)(error));
+            if (error) {
+                const msg = (0, supabaseClient_1.formatSupabaseError)(error);
+                if (msg.toLowerCase().includes(duplicateError)) {
+                    const before = batch.length;
+                    batch = deduplicateByConflictKeys(batch, matchColumn);
+                    console.log(`[Supabase ${batchLabel}] duplicate-row error caught, dedup fallback: ${before} → ${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);
+            }
             return data;
         }, batchLabel);
         if (Array.isArray(data)) {

package/package.json

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