Fix tenant-per-document in SQL race reconciliation and deferred relationship keys

Author: premtsd-code

src/Database/Adapter/SQL.php

@@ -2677,12 +2677,27 @@ public function createDocuments(Document $collection, array $documents, bool $ig
                 }
 
                 $tenantWhere = '';
+                $tenantSelect = '';
                 if ($this->sharedTables) {
-                    $tenantWhere = ' AND _tenant = :_vfy_tenant';
-                    $verifyBinds[':_vfy_tenant'] = $this->getTenant();
+                    if ($this->tenantPerDocument) {
+                        $tenants = \array_values(\array_unique(\array_filter(
+                            \array_map(fn (Document $doc) => $doc->getTenant(), $documents)
+                        )));
+                        $tenantPlaceholders = [];
+                        foreach ($tenants as $j => $tenant) {
+                            $tKey = ':_vfy_tenant_' . $j;
+                            $tenantPlaceholders[] = $tKey;
+                            $verifyBinds[$tKey] = $tenant;
+                        }
+                        $tenantWhere = ' AND _tenant IN (' . \implode(', ', $tenantPlaceholders) . ')';
+                        $tenantSelect = ', _tenant';
+                    } else {
+                        $tenantWhere = ' AND _tenant = :_vfy_tenant';
+                        $verifyBinds[':_vfy_tenant'] = $this->getTenant();
+                    }
                 }
 
-                $verifySql = 'SELECT _uid, ' . $this->quote($this->filter('_createdAt'))
+                $verifySql = 'SELECT _uid' . $tenantSelect . ', ' . $this->quote($this->filter('_createdAt'))
                     . ' FROM ' . $this->getSQLTable($name)
                     . ' WHERE _uid IN (' . \implode(', ', $verifyPlaceholders) . ')'
                     . $tenantWhere;
@@ -2698,16 +2713,19 @@ public function createDocuments(Document $collection, array $documents, bool $ig
                 // Keep only docs whose _createdAt matches what we set (= ours, not racer's)
                 $actualTimestamps = [];
                 foreach ($rows as $row) {
-                    $actualTimestamps[$row['_uid']] = $row['_createdAt'];
+                    $key = ($this->sharedTables && $this->tenantPerDocument)
+                        ? $row['_tenant'] . ':' . $row['_uid']
+                        : $row['_uid'];
+                    $actualTimestamps[$key] = $row['_createdAt'];
                 }
 
                 $insertedDocs = [];
-                $insertedUids = [];
                 foreach ($documents as $doc) {
-                    $uid = $doc->getId();
-                    if (isset($actualTimestamps[$uid]) && $actualTimestamps[$uid] === $expectedTimestamps[$uid]) {
+                    $key = ($this->sharedTables && $this->tenantPerDocument)
+                        ? $doc->getTenant() . ':' . $doc->getId()
+                        : $doc->getId();
+                    if (isset($actualTimestamps[$key]) && $actualTimestamps[$key] === $expectedTimestamps[$doc->getId()]) {
                         $insertedDocs[] = $doc;
-                        $insertedUids[$uid] = true;
                     }
                 }
                 $documents = $insertedDocs;

src/Database/Database.php

@@ -5786,7 +5786,10 @@ public function createDocuments(
                     $document->removeAttribute($key);
                 }
                 if (!empty($relationshipData)) {
-                    $deferredRelationships[$document->getId()] = $relationshipData;
+                    $deferKey = $tenantPerDocument
+                        ? $document->getTenant() . ':' . $document->getId()
+                        : $document->getId();
+                    $deferredRelationships[$deferKey] = $relationshipData;
                 }
             } elseif ($this->resolveRelationships) {
                 $preExistKey = $tenantPerDocument
@@ -5821,14 +5824,16 @@ public function createDocuments(
             // In ignore mode, create relationships only for docs actually inserted
             if ($ignore && $this->resolveRelationships && \count($deferredRelationships) > 0) {
                 foreach ($batch as $insertedDoc) {
-                    $docId = $insertedDoc->getId();
-                    if (\array_key_exists($docId, $deferredRelationships)) {
+                    $deferKey = $tenantPerDocument
+                        ? $insertedDoc->getTenant() . ':' . $insertedDoc->getId()
+                        : $insertedDoc->getId();
+                    if (\array_key_exists($deferKey, $deferredRelationships)) {
                         $relDoc = clone $insertedDoc;
-                        foreach ($deferredRelationships[$docId] as $key => $value) {
+                        foreach ($deferredRelationships[$deferKey] as $key => $value) {
                             $relDoc->setAttribute($key, $value);
                         }
                         $this->silent(fn () => $this->createDocumentRelationships($collection, $relDoc));
-                        unset($deferredRelationships[$docId]);
+                        unset($deferredRelationships[$deferKey]);
                     }
                 }
             }