Apply changes to postgres

Author: abnegate

src/Database/Adapter/Postgres.php

@@ -924,17 +924,13 @@ public function createDocument(string $collection, Document $document): Document
         $attributes['_permissions'] = \json_encode($document->getPermissions());
 
         if ($this->sharedTables) {
-            $attributes['_tenant'] = $this->tenant;
+            $attributes['_tenant'] = $document->getTenant();
         }
 
         $name = $this->filter($collection);
         $columns = '';
         $columnNames = '';
 
-        /**
-         * Insert Attributes
-         */
-
         // Insert internal id if set
         if (!empty($document->getInternalId())) {
             $bindKey = '_id';
@@ -969,12 +965,12 @@ public function createDocument(string $collection, Document $document): Document
 
         $attributeIndex = 0;
         foreach ($attributes as $value) {
-            if (is_array($value)) {
+            if (\is_array($value)) {
                 $value = \json_encode($value);
             }
 
             $bindKey = 'key_' . $attributeIndex;
-            $value = (is_bool($value)) ? ($value ? "true" : "false") : $value;
+            $value = (\is_bool($value)) ? ($value ? "true" : "false") : $value;
             $stmt->bindValue(':' . $bindKey, $value, $this->getPDOType($value));
             $attributeIndex++;
         }
@@ -984,7 +980,7 @@ public function createDocument(string $collection, Document $document): Document
             foreach ($document->getPermissionsByType($type) as $permission) {
                 $permission = \str_replace('"', '', $permission);
                 $sqlTenant = $this->sharedTables ? ', :_tenant' : '';
-                $permissions[] = "('{$type}', '{$permission}', '{$document->getId()}' {$sqlTenant})";
+                $permissions[] = "('{$type}', '{$permission}', :_uid {$sqlTenant})";
             }
         }
 
@@ -1000,8 +996,9 @@ public function createDocument(string $collection, Document $document): Document
 
             $queryPermissions = $this->trigger(Database::EVENT_PERMISSIONS_CREATE, $queryPermissions);
             $stmtPermissions = $this->getPDO()->prepare($queryPermissions);
+            $stmtPermissions->bindValue(':_uid', $document->getId());
             if ($sqlTenant) {
-                $stmtPermissions->bindValue(':_tenant', $this->tenant);
+                $stmtPermissions->bindValue(':_tenant', $document->getTenant());
             }
         }
 
@@ -1070,7 +1067,7 @@ public function createDocuments(string $collection, array $documents): array
             $bindValues = [];
             $permissions = [];
 
-            foreach ($documents as $document) {
+            foreach ($documents as $index => $document) {
                 $attributes = $document->getAttributes();
                 $attributes['_uid'] = $document->getId();
                 $attributes['_createdAt'] = $document->getCreatedAt();
@@ -1084,7 +1081,7 @@ public function createDocuments(string $collection, array $documents): array
                 }
 
                 if ($this->sharedTables) {
-                    $attributes['_tenant'] = $this->tenant;
+                    $attributes['_tenant'] = $document->getTenant();
                 }
 
                 $bindKeys = [];
@@ -1104,17 +1101,20 @@ public function createDocuments(string $collection, array $documents): array
                 $batchKeys[] = '(' . \implode(', ', $bindKeys) . ')';
                 foreach (Database::PERMISSIONS as $type) {
                     foreach ($document->getPermissionsByType($type) as $permission) {
+                        $tenantBind = $this->sharedTables ? ", :_tenant_{$index}" : '';
                         $permission = \str_replace('"', '', $permission);
-                        $permissions[] = "('{$type}', '{$permission}', '{$document->getId()}', :_tenant)";
+                        $permission = "('{$type}', '{$permission}', :_uid_{$index} {$tenantBind})";
+                        $permissions[] = $permission;
                     }
                 }
             }
 
-            $stmt = $this->getPDO()->prepare(
-                "
+            $batchKeys = \implode(', ', $batchKeys);
+
+            $stmt = $this->getPDO()->prepare("
                 INSERT INTO {$this->getSQLTable($name)} {$columns}
-                VALUES " . \implode(', ', $batchKeys)
-            );
+                VALUES {$batchKeys}
+            ");
 
             foreach ($bindValues as $key => $value) {
                 $stmt->bindValue($key, $value, $this->getPDOType($value));
@@ -1123,12 +1123,23 @@ public function createDocuments(string $collection, array $documents): array
             $stmt->execute();
 
             if (!empty($permissions)) {
-                $stmtPermissions = $this->getPDO()->prepare(
-                    "
-                    INSERT INTO {$this->getSQLTable($name . '_perms')} (_type, _permission, _document, _tenant) 
-                    VALUES " . \implode(', ', $permissions)
-                );
-                $stmtPermissions->bindValue(':_tenant', $this->tenant);
+                $tenantColumn = $this->sharedTables ? ', _tenant' : '';
+                $permissions = \implode(', ', $permissions);
+
+                $sqlPermissions = "
+                    INSERT INTO {$this->getSQLTable($name . '_perms')} (_type, _permission, _document {$tenantColumn})
+                    VALUES {$permissions};
+                ";
+
+                $stmtPermissions = $this->getPDO()->prepare($sqlPermissions);
+
+                foreach ($documents as $index => $document) {
+                    $stmtPermissions->bindValue(":_uid_{$index}", $document->getId());
+                    if ($this->sharedTables) {
+                        $stmtPermissions->bindValue(":_tenant_{$index}", $document->getTenant());
+                    }
+                }
+
                 $stmtPermissions?->execute();
             }
         } catch (PDOException $e) {
@@ -2000,7 +2011,7 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
                 unset($results[$index]['_id']);
             }
             if (\array_key_exists('_tenant', $document)) {
-                $results[$index]['$tenant'] = $document['_tenant'];
+                $results[$index]['$tenant'] = $document['_tenant'] === null ? null : (int)$document['_tenant'];
                 unset($results[$index]['_tenant']);
             }
             if (\array_key_exists('_createdAt', $document)) {