Defer relationship creation in ignore mode to prevent orphaned relationships

Author: premtsd-code

src/Database/Database.php

@@ -5725,6 +5725,12 @@ public function createDocuments(
             }
         }
 
+        // For ignore mode: defer relationship creation until after INSERT
+        $deferredRelationships = [];
+        $relationships = $ignore && $this->resolveRelationships
+            ? \array_filter($collection->getAttribute('attributes', []), fn ($attr) => $attr['type'] === self::VAR_RELATIONSHIP)
+            : [];
+
         foreach ($documents as $document) {
             $createdAt = $document->getCreatedAt();
             $updatedAt = $document->getUpdatedAt();
@@ -5765,12 +5771,30 @@ public function createDocuments(
             }
 
             if ($this->resolveRelationships) {
-                $preExistKey = $tenantPerDocument
-                    ? $document->getTenant() . ':' . $document->getId()
-                    : $document->getId();
+                if ($ignore) {
+                    // In ignore mode, defer relationship creation until after INSERT
+                    // to avoid orphaned relationships from race-condition duplicates.
+                    // Store original relationship data and strip attributes for INSERT.
+                    $relationshipData = [];
+                    foreach ($relationships as $rel) {
+                        $key = $rel['key'];
+                        $value = $document->getAttribute($key);
+                        if ($value !== null) {
+                            $relationshipData[$key] = $value;
+                        }
+                        $document->removeAttribute($key);
+                    }
+                    if (!empty($relationshipData)) {
+                        $deferredRelationships[$document->getId()] = $relationshipData;
+                    }
+                } else {
+                    $preExistKey = $tenantPerDocument
+                        ? $document->getTenant() . ':' . $document->getId()
+                        : $document->getId();
 
-                if (!isset($preExistingIds[$preExistKey])) {
-                    $document = $this->silent(fn () => $this->createDocumentRelationships($collection, $document));
+                    if (!isset($preExistingIds[$preExistKey])) {
+                        $document = $this->silent(fn () => $this->createDocumentRelationships($collection, $document));
+                    }
                 }
             }
 
@@ -5794,6 +5818,21 @@ public function createDocuments(
                 return $this->adapter->createDocuments($collection, $chunk, $ignore);
             });
 
+            // In ignore mode, create relationships only for docs actually inserted
+            if ($ignore && $this->resolveRelationships && !empty($deferredRelationships)) {
+                foreach ($batch as $insertedDoc) {
+                    $docId = $insertedDoc->getId();
+                    if (isset($deferredRelationships[$docId])) {
+                        $relDoc = clone $insertedDoc;
+                        foreach ($deferredRelationships[$docId] as $key => $value) {
+                            $relDoc->setAttribute($key, $value);
+                        }
+                        $this->silent(fn () => $this->createDocumentRelationships($collection, $relDoc));
+                        unset($deferredRelationships[$docId]);
+                    }
+                }
+            }
+
             $batch = $this->adapter->getSequences($collection->getId(), $batch);
 
             if (!$this->inBatchRelationshipPopulation && $this->resolveRelationships) {