Add schema to all queries containing the tablename

This adds the schema-enabling to all queries that target the tablename.

Author: heiglandreas

docker-compose.yml

@@ -7,13 +7,13 @@ services:
       - .:/app
     environment:
       - PROOPH_ENV=dev
-      - PDO_DSN=pgsql:host=postgres port=5432 dbname=event_engine
+      - PDO_DSN=pgsql:host=postgres port=5433 dbname=event_engine
       - PDO_USER=postgres
       - PDO_PWD=
 
   postgres:
     image: postgres:alpine
     ports:
-      - 5432:5432
+      - 5433:5432
     environment:
       - POSTGRES_DB=event_engine

src/PostgresDocumentStore.php

@@ -177,7 +177,7 @@ public function addCollection(string $collectionName, Index ...$indices): void
     public function dropCollection(string $collectionName): void
     {
         $cmd = <<<EOT
-DROP TABLE {$this->tableName($collectionName)};
+DROP TABLE {$this->schemaName($collectionName)}.{$this->tableName($collectionName)};
 EOT;
 
         $this->transactional(function () use ($cmd) {
@@ -191,6 +191,7 @@ public function hasCollectionIndex(string $collectionName, string $indexName): b
 SELECT INDEXNAME 
 FROM pg_indexes
 WHERE TABLENAME = '{$this->tableName($collectionName)}'
+AND SCHEMANAME = '{$this->schemaName($collectionName)}'
 AND INDEXNAME = '$indexName'
 EOT;
 
@@ -223,7 +224,7 @@ public function addCollectionIndex(string $collectionName, Index $index): void
             $columnsSql = substr($columnsSql, 2);
 
             $metadataColumnCmd = <<<EOT
-ALTER TABLE {$this->tableName($collectionName)}
+ALTER TABLE {$this->schemaName($collectionName)}.{$this->tableName($collectionName)}
     $columnsSql;
 EOT;
 
@@ -263,7 +264,7 @@ public function dropCollectionIndex(string $collectionName, $index): void
             $columnsSql = substr($columnsSql, 2);
 
             $metadataColumnCmd = <<<EOT
-ALTER TABLE {$this->tableName($collectionName)}
+ALTER TABLE {$this->schemaName($collectionName)}.{$this->tableName($collectionName)}
     $columnsSql;
 EOT;
             $index = $index->indexCmd();
@@ -313,7 +314,9 @@ public function addDoc(string $collectionName, string $docId, array $doc): void
         }
 
         $cmd = <<<EOT
-INSERT INTO {$this->tableName($collectionName)} (id, doc{$metadataKeysStr}) VALUES (:id, :doc{$metadataValsStr});
+INSERT INTO {$this->schemaName($collectionName)}.{$this->tableName($collectionName)} (
+    id, doc{$metadataKeysStr}) VALUES (:id, :doc{$metadataValsStr}
+);
 EOT;
 
         $this->transactional(function () use ($cmd, $docId, $doc, $metadata) {
@@ -346,7 +349,7 @@ public function updateDoc(string $collectionName, string $docId, array $docOrSub
         }
 
         $cmd = <<<EOT
-UPDATE {$this->tableName($collectionName)}
+UPDATE {$this->schemaName($collectionName)}.{$this->tableName($collectionName)}
 SET doc = (to_jsonb(doc) || :doc){$metadataStr}
 WHERE id = :id
 ;
@@ -385,7 +388,7 @@ public function updateMany(string $collectionName, Filter $filter, array $set):
         }
 
         $cmd = <<<EOT
-UPDATE {$this->tableName($collectionName)}
+UPDATE {$this->schemaName($collectionName)}.{$this->tableName($collectionName)}
 SET doc = (to_jsonb(doc) || :doc){$metadataStr}
 $where;
 EOT;
@@ -425,7 +428,7 @@ public function upsertDoc(string $collectionName, string $docId, array $docOrSub
     public function deleteDoc(string $collectionName, string $docId): void
     {
         $cmd = <<<EOT
-DELETE FROM {$this->tableName($collectionName)}
+DELETE FROM {$this->schemaName($collectionName)}.{$this->tableName($collectionName)}
 WHERE id = :id
 EOT;
 
@@ -448,7 +451,7 @@ public function deleteMany(string $collectionName, Filter $filter): void
         $where = $filterStr? "WHERE $filterStr" : '';
 
         $cmd = <<<EOT
-DELETE FROM {$this->tableName($collectionName)}
+DELETE FROM {$this->schemaName($collectionName)}.{$this->tableName($collectionName)}
 $where;
 EOT;
 
@@ -466,7 +469,7 @@ public function getDoc(string $collectionName, string $docId): ?array
     {
         $query = <<<EOT
 SELECT doc
-FROM {$this->tableName($collectionName)}
+FROM {$this->schemaName($collectionName)}.{$this->tableName($collectionName)}
 WHERE id = :id
 EOT;
         $stmt = $this->connection->prepare($query);
@@ -503,7 +506,7 @@ public function filterDocs(string $collectionName, Filter $filter, int $skip = n
 
         $query = <<<EOT
 SELECT doc 
-FROM {$this->tableName($collectionName)}
+FROM {$this->schemaName($collectionName)}.{$this->tableName($collectionName)}
 $where
 $orderBy
 $limit
@@ -702,7 +705,7 @@ private function indexToSqlCmd(Index $index, string $collectionName): string
         $name = $index->name() ?? '';
 
         $cmd = <<<EOT
-CREATE $type $name ON {$this->tableName($collectionName)}
+CREATE $type $name ON {$this->schemaName($collectionName)}.{$this->tableName($collectionName)}
 $fields;
 EOT;