Address comments

Author: fogelito

src/Database/Adapter/MariaDB.php

@@ -1960,15 +1960,12 @@ public function deleteDocuments(string $collection, array $internalIds, array $p
 
         try {
             $name = $this->filter($collection);
-            $where = [];
 
-            if ($this->sharedTables) {
-                $where[] = "_tenant = :_tenant";
-            }
-
-            $where[] = "_id IN (" . \implode(', ', \array_map(fn ($index) => ":_id_{$index}", \array_keys($internalIds))) . ")";
-
-            $sql = "DELETE FROM {$this->getSQLTable($name)} WHERE " . \implode(' AND ', $where);
+            $sql = "
+            DELETE FROM {$this->getSQLTable($name)} 
+            WHERE _id IN (" . \implode(', ', \array_map(fn ($index) => ":_id_{$index}", \array_keys($internalIds))) . ")
+            {$this->getTenantQuery($collection)}
+            ";
 
             $sql = $this->trigger(Database::EVENT_DOCUMENTS_DELETE, $sql);
 
@@ -1989,19 +1986,16 @@ public function deleteDocuments(string $collection, array $internalIds, array $p
             if (!empty($permissionIds)) {
                 $sql = "
                 DELETE FROM {$this->getSQLTable($name . '_perms')} 
-                WHERE _document IN (" . \implode(', ', \array_map(fn ($index) => ":_pid_{$index}", \array_keys($permissionIds))) . ")
-            ";
-
-                if ($this->sharedTables) {
-                    $sql .= ' AND _tenant = :_tenant';
-                }
+                WHERE _document IN (" . \implode(', ', \array_map(fn ($index) => ":_id_{$index}", \array_keys($permissionIds))) . ")
+                {$this->getTenantQuery($collection)}
+                ";
 
                 $sql = $this->trigger(Database::EVENT_PERMISSIONS_DELETE, $sql);
 
                 $stmtPermissions = $this->getPDO()->prepare($sql);
 
                 foreach ($permissionIds as $id => $value) {
-                    $stmtPermissions->bindValue(":_pid_{$id}", $value);
+                    $stmtPermissions->bindValue(":_id_{$id}", $value);
                 }
 
                 if ($this->sharedTables) {

src/Database/Database.php

@@ -5508,13 +5508,13 @@ public function deleteDocuments(string $collection, array $queries = [], int $ba
                 break;
             }
 
-            $internalId = [];
-            $permIds = [];
+            $internalIds = [];
+            $permissionIds = [];
             foreach ($affectedDocuments as $document) {
                 $documents[] = $document;
-                $internalId[] = $document->getInternalId();
+                $internalIds[] = $document->getInternalId();
                 if (!empty($document->getPermissions())) {
-                    $permIds[] = $document->getId();
+                    $permissionIds[] = $document->getId();
                 }
 
                 if ($this->resolveRelationships) {
@@ -5536,11 +5536,11 @@ public function deleteDocuments(string $collection, array $queries = [], int $ba
                 }
             }
 
-            $this->withTransaction(function () use ($collection, $skipAuth, $authorization, $internalId, $permIds) {
+            $this->withTransaction(function () use ($collection, $skipAuth, $authorization, $internalIds, $permissionIds) {
                 $getResults = fn () => $this->adapter->deleteDocuments(
                     $collection->getId(),
-                    $internalId,
-                    $permIds
+                    $internalIds,
+                    $permissionIds
                 );
 
                 $skipAuth ? $authorization->skip($getResults) : $getResults();