cache

Author: fogelito

composer.lock

@@ -1549,6 +1549,8 @@ protected function getAttributeProjection(array $selections, string $prefix = ''
             return '*';
         }
 
+        $selections = \array_diff($selections, ['$id', '$permissions', '$collection']);
+
         $selections[] = $this->getInternalKeyForAttribute('$id');
         $selections[] = $this->getInternalKeyForAttribute('$permissions');
 

src/Database/Adapter/SQL.php

@@ -6440,25 +6440,21 @@ public function getSchemaAttributes(string $collection): array
      */
     public function getCacheKeys(string $collectionId, ?string $documentId = null, array $selects = []): array
     {
+        $hostname = '';
+
         if ($this->getSharedTables()) {
-            $collectionKey = \sprintf(
-                '%s-cache-%s:%s:%s:collection:%s',
-                $this->cacheName,
-                $this->adapter->getHostname(),
-                $this->getNamespace(),
-                $this->adapter->getTenant(),
-                $collectionId
-            );
-        } else {
-            $collectionKey = \sprintf(
-                '%s-cache-%s:%s:collection:%s',
-                $this->cacheName,
-                $this->getNamespace(),
-                $this->adapter->getTenant(),
-                $collectionId
-            );
+            $hostname = $this->adapter->getHostname();
         }
 
+        $collectionKey = \sprintf(
+            '%s-cache-%s:%s:%s:collection:%s',
+            $this->cacheName,
+            $hostname,
+            $this->getNamespace(),
+            $this->adapter->getTenant(),
+            $collectionId
+        );
+
         if ($documentId) {
             $documentKey = $documentHashKey = "{$collectionKey}:{$documentId}";
 

src/Database/Database.php

@@ -59,15 +59,31 @@ public function reconnect(): void
 
     public function getScheme(): string
     {
-        $parts = parse_url($this->dsn);
+        $parts = $this->parseDsn($this->dsn);
 
         return $parts['scheme'] ?? throw new \Exception('No scheme found in DSN');
     }
 
     public function getHostname(): string
     {
-        $parts = parse_url($this->dsn);
+        $parts = $this->parseDsn($this->dsn);
 
         return $parts['host'] ?? throw new \Exception('No host found in DSN');
     }
+    public function parseDsn(string $dsn):array
+    {
+        $result = [];
+
+        [$driver, $params] = explode(':', $dsn, 2);
+        $result['driver'] = $driver;
+
+        foreach (explode(';', $params) as $pair) {
+            if (str_contains($pair, '=')) {
+                [$key, $value] = explode('=', $pair, 2);
+                $result[$key] = $value;
+            }
+        }
+
+        return $result;
+    }
 }