Merge pull request #568 from utopia-php/fix-keep-null-tenant

Remove tenant set on update

Author: abnegate

src/Database/Adapter/MariaDB.php

@@ -1134,10 +1134,6 @@ public function updateDocument(string $collection, string $id, Document $documen
             $attributes['_updatedAt'] = $document->getUpdatedAt();
             $attributes['_permissions'] = json_encode($document->getPermissions());
 
-            if ($this->sharedTables) {
-                $attributes['_tenant'] = $this->tenant;
-            }
-
             $name = $this->filter($collection);
             $columns = '';
 

src/Database/Adapter/Postgres.php

@@ -1183,10 +1183,6 @@ public function updateDocument(string $collection, string $id, Document $documen
         $attributes['_updatedAt'] = $document->getUpdatedAt();
         $attributes['_permissions'] = json_encode($document->getPermissions());
 
-        if ($this->sharedTables) {
-            $attributes['_tenant'] = $this->tenant;
-        }
-
         $name = $this->filter($collection);
         $columns = '';
 

src/Database/Database.php

@@ -3902,7 +3902,7 @@ public function updateDocument(string $collection, string $id, Document $documen
             $document['$createdAt'] = $old->getCreatedAt();                 // Make sure user doesn't switch createdAt
 
             if ($this->adapter->getSharedTables()) {
-                $document['$tenant'] = $old->getTenant();       // Make sure user doesn't switch tenant
+                $document['$tenant'] = $old->getTenant();                   // Make sure user doesn't switch tenant
             }
 
             $document = new Document($document);

tests/e2e/Adapter/Base.php

@@ -16569,6 +16569,53 @@ public function testSharedTablesDuplicates(): void
             ->setDatabase($schema);
     }
 
+    public function testSharedTablesUpdateTenant(): void
+    {
+        $database = static::getDatabase();
+        $sharedTables = $database->getSharedTables();
+        $namespace = $database->getNamespace();
+        $schema = $database->getDatabase();
+
+        if (!$database->getAdapter()->getSupportForSchemas()) {
+            $this->expectNotToPerformAssertions();
+            return;
+        }
+
+        if ($database->exists('sharedTables')) {
+            $database->setDatabase('sharedTables')->delete();
+        }
+
+        $database
+            ->setDatabase('sharedTables')
+            ->setNamespace('')
+            ->setSharedTables(true)
+            ->setTenant(null)
+            ->create();
+
+        // Create collection
+        $database->createCollection(__FUNCTION__, documentSecurity: false);
+
+        $database
+            ->setTenant(1)
+            ->updateDocument(Database::METADATA, __FUNCTION__, new Document([
+                '$id' => __FUNCTION__,
+                'name' => 'Scooby Doo',
+            ]));
+
+        // Ensure tenant was not swapped
+        $doc = $database
+            ->setTenant(null)
+            ->getDocument(Database::METADATA, __FUNCTION__);
+
+        $this->assertEquals('Scooby Doo', $doc['name']);
+
+        // Reset state
+        $database
+            ->setSharedTables($sharedTables)
+            ->setNamespace($namespace)
+            ->setDatabase($schema);
+    }
+
     public function testSharedTablesTenantPerDocument(): void
     {
         $database = static::getDatabase();