Merge pull request #130 from basz/quote-tablenames

Quote tablenames
prooph · Feb 6, 2018 · 005f670 · 005f670
2 parents 734ea5e + f6f03ba
commit 005f670
Show file tree

Hide file tree

Showing 30 changed files with 1,456 additions and 137 deletions.
diff --git a/README.md b/README.md
@@ -106,15 +106,24 @@ and a running Postgres server listening on port `5432`. Both should contain an e
 
 ### MariaDb
 
-`$ docker-compose -f docker-compose-tests.yml run --rm composer run-script test-mariadb --timeout 0`
+```bash
+docker-compose -f docker-compose-tests.yml run composer run-script test-mariadb --timeout 0; \
+docker stop proophpdoeventstore_mariadb_1 && docker rm proophpdoeventstore_mariadb_1
+```
 
 ### MySql
 
-`$ docker-compose -f docker-compose-tests.yml run --rm composer run-script test-mysql --timeout 0`
+```bash
+docker-compose -f docker-compose-tests.yml run composer run-script test-mysql --timeout 0; \
+docker stop proophpdoeventstore_mysql_1 && docker rm proophpdoeventstore_mysql_1
+```
 
 ### Postgres
 
-`$ docker-compose -f docker-compose-tests.yml run --rm composer run-script test-postgres --timeout 0`
+```bash
+docker-compose -f docker-compose-tests.yml run composer run-script test-postgres --timeout 0; \
+docker stop proophpdoeventstore_postgres_1 && docker rm proophpdoeventstore_postgres_1
+```
 
 ## Support
 

diff --git a/src/MariaDbEventStore.php b/src/MariaDbEventStore.php
@@ -94,7 +94,7 @@ public function __construct(
     public function fetchStreamMetadata(StreamName $streamName): array
     {
         $sql = <<<EOT
-SELECT metadata FROM $this->eventStreamsTable
+SELECT metadata FROM `$this->eventStreamsTable`
 WHERE real_stream_name = :streamName; 
 EOT;
 
@@ -123,7 +123,7 @@ public function updateStreamMetadata(StreamName $streamName, array $newMetadata)
         $eventStreamsTable = $this->eventStreamsTable;
 
         $sql = <<<EOT
-UPDATE $eventStreamsTable
+UPDATE `$eventStreamsTable`
 SET metadata = :metadata
 WHERE real_stream_name = :streamName; 
 EOT;
@@ -150,7 +150,7 @@ public function updateStreamMetadata(StreamName $streamName, array $newMetadata)
     public function hasStream(StreamName $streamName): bool
     {
         $sql = <<<EOT
-SELECT COUNT(1) FROM $this->eventStreamsTable
+SELECT COUNT(1) FROM `$this->eventStreamsTable`
 WHERE real_stream_name = :streamName;
 EOT;
 
@@ -179,7 +179,7 @@ public function create(Stream $stream): void
             $tableName = $this->persistenceStrategy->generateTableName($streamName);
             $this->createSchemaFor($tableName);
         } catch (RuntimeException $exception) {
-            $this->connection->exec("DROP TABLE IF EXISTS $tableName;");
+            $this->connection->exec("DROP TABLE IF EXISTS `$tableName`;");
             $this->removeStreamFromStreamsTable($streamName);
 
             throw $exception;
@@ -223,7 +223,7 @@ public function appendTo(StreamName $streamName, Iterator $streamEvents): void
         $rowPlaces = '(' . implode(', ', array_fill(0, count($columnNames), '?')) . ')';
         $allPlaces = implode(', ', array_fill(0, $countEntries, $rowPlaces));
 
-        $sql = 'INSERT INTO ' . $tableName . ' (' . implode(', ', $columnNames) . ') VALUES ' . $allPlaces;
+        $sql = 'INSERT INTO `' . $tableName . '` (' . implode(', ', $columnNames) . ') VALUES ' . $allPlaces;
 
         if (! $this->disableTransactionHandling && ! $this->connection->inTransaction()) {
             $this->connection->beginTransaction();
@@ -298,7 +298,7 @@ public function load(
         }
 
         $query = <<<EOT
-SELECT * FROM $tableName $queryHint
+SELECT * FROM `$tableName` $queryHint
 $whereCondition
 ORDER BY `no` ASC
 LIMIT :limit;
@@ -372,7 +372,7 @@ public function loadReverse(
         }
 
         $query = <<<EOT
-SELECT * FROM $tableName $queryHint
+SELECT * FROM `$tableName` $queryHint
 $whereCondition
 ORDER BY `no` DESC
 LIMIT :limit;
@@ -431,7 +431,7 @@ public function delete(StreamName $streamName): void
         $encodedStreamName = $this->persistenceStrategy->generateTableName($streamName);
 
         $deleteEventStreamSql = <<<EOT
-DROP TABLE IF EXISTS $encodedStreamName;
+DROP TABLE IF EXISTS `$encodedStreamName`;
 EOT;
 
         $statement = $this->connection->prepare($deleteEventStreamSql);
@@ -470,7 +470,7 @@ public function fetchStreamNames(
         }
 
         $query = <<<SQL
-SELECT `real_stream_name` FROM $this->eventStreamsTable
+SELECT `real_stream_name` FROM `$this->eventStreamsTable`
 $whereCondition
 ORDER BY `real_stream_name` ASC
 LIMIT $offset, $limit
@@ -521,7 +521,7 @@ public function fetchStreamNamesRegex(
         $whereCondition = 'WHERE ' . implode(' AND ', $where);
 
         $query = <<<SQL
-SELECT `real_stream_name` FROM $this->eventStreamsTable
+SELECT `real_stream_name` FROM `$this->eventStreamsTable`
 $whereCondition
 ORDER BY `real_stream_name` ASC
 LIMIT $offset, $limit
@@ -567,7 +567,7 @@ public function fetchCategoryNames(?string $filter, int $limit = 20, int $offset
         }
 
         $query = <<<SQL
-SELECT `category` FROM $this->eventStreamsTable
+SELECT `category` FROM `$this->eventStreamsTable`
 $whereCondition
 GROUP BY `category`
 ORDER BY `category` ASC
@@ -613,7 +613,7 @@ public function fetchCategoryNamesRegex(string $filter, int $limit = 20, int $of
         $whereCondition = 'WHERE `category` REGEXP :filter AND `category` IS NOT NULL';
 
         $query = <<<SQL
-SELECT `category` FROM $this->eventStreamsTable
+SELECT `category` FROM `$this->eventStreamsTable`
 $whereCondition
 GROUP BY `category`
 ORDER BY `category` ASC
@@ -737,7 +737,7 @@ private function addStreamToStreamsTable(Stream $stream): void
         $metadata = json_encode($stream->metadata());
 
         $sql = <<<EOT
-INSERT INTO $this->eventStreamsTable (real_stream_name, stream_name, metadata, category)
+INSERT INTO `$this->eventStreamsTable` (real_stream_name, stream_name, metadata, category)
 VALUES (:realStreamName, :streamName, :metadata, :category);
 EOT;
 
@@ -770,7 +770,7 @@ private function addStreamToStreamsTable(Stream $stream): void
     private function removeStreamFromStreamsTable(StreamName $streamName): void
     {
         $deleteEventStreamTableEntrySql = <<<EOT
-DELETE FROM $this->eventStreamsTable WHERE real_stream_name = ?;
+DELETE FROM `$this->eventStreamsTable` WHERE real_stream_name = ?;
 EOT;
 
         $statement = $this->connection->prepare($deleteEventStreamTableEntrySql);

diff --git a/src/MySqlEventStore.php b/src/MySqlEventStore.php
@@ -94,7 +94,7 @@ public function __construct(
     public function fetchStreamMetadata(StreamName $streamName): array
     {
         $sql = <<<EOT
-SELECT metadata FROM $this->eventStreamsTable
+SELECT metadata FROM `$this->eventStreamsTable`
 WHERE real_stream_name = :streamName; 
 EOT;
 
@@ -123,7 +123,7 @@ public function updateStreamMetadata(StreamName $streamName, array $newMetadata)
         $eventStreamsTable = $this->eventStreamsTable;
 
         $sql = <<<EOT
-UPDATE $eventStreamsTable
+UPDATE `$eventStreamsTable`
 SET metadata = :metadata
 WHERE real_stream_name = :streamName; 
 EOT;
@@ -150,7 +150,7 @@ public function updateStreamMetadata(StreamName $streamName, array $newMetadata)
     public function hasStream(StreamName $streamName): bool
     {
         $sql = <<<EOT
-SELECT COUNT(1) FROM $this->eventStreamsTable
+SELECT COUNT(1) FROM `$this->eventStreamsTable`
 WHERE real_stream_name = :streamName;
 EOT;
 
@@ -179,7 +179,7 @@ public function create(Stream $stream): void
             $tableName = $this->persistenceStrategy->generateTableName($streamName);
             $this->createSchemaFor($tableName);
         } catch (RuntimeException $exception) {
-            $this->connection->exec("DROP TABLE IF EXISTS $tableName;");
+            $this->connection->exec("DROP TABLE IF EXISTS `$tableName`;");
             $this->removeStreamFromStreamsTable($streamName);
 
             throw $exception;
@@ -223,7 +223,7 @@ public function appendTo(StreamName $streamName, Iterator $streamEvents): void
         $rowPlaces = '(' . implode(', ', array_fill(0, count($columnNames), '?')) . ')';
         $allPlaces = implode(', ', array_fill(0, $countEntries, $rowPlaces));
 
-        $sql = 'INSERT INTO ' . $tableName . ' (' . implode(', ', $columnNames) . ') VALUES ' . $allPlaces;
+        $sql = 'INSERT INTO `' . $tableName . '` (' . implode(', ', $columnNames) . ') VALUES ' . $allPlaces;
 
         if (! $this->disableTransactionHandling && ! $this->connection->inTransaction()) {
             $this->connection->beginTransaction();
@@ -298,7 +298,7 @@ public function load(
         }
 
         $query = <<<EOT
-SELECT * FROM $tableName $queryHint
+SELECT * FROM `$tableName` $queryHint
 $whereCondition
 ORDER BY `no` ASC
 LIMIT :limit;
@@ -372,7 +372,7 @@ public function loadReverse(
         }
 
         $query = <<<EOT
-SELECT * FROM $tableName $queryHint
+SELECT * FROM `$tableName` $queryHint
 $whereCondition
 ORDER BY `no` DESC
 LIMIT :limit;
@@ -431,7 +431,7 @@ public function delete(StreamName $streamName): void
         $encodedStreamName = $this->persistenceStrategy->generateTableName($streamName);
 
         $deleteEventStreamSql = <<<EOT
-DROP TABLE IF EXISTS $encodedStreamName;
+DROP TABLE IF EXISTS `$encodedStreamName`;
 EOT;
 
         $statement = $this->connection->prepare($deleteEventStreamSql);
@@ -470,7 +470,7 @@ public function fetchStreamNames(
         }
 
         $query = <<<SQL
-SELECT `real_stream_name` FROM $this->eventStreamsTable
+SELECT `real_stream_name` FROM `$this->eventStreamsTable`
 $whereCondition
 ORDER BY `real_stream_name` ASC
 LIMIT $offset, $limit
@@ -521,7 +521,7 @@ public function fetchStreamNamesRegex(
         $whereCondition = 'WHERE ' . implode(' AND ', $where);
 
         $query = <<<SQL
-SELECT `real_stream_name` FROM $this->eventStreamsTable
+SELECT `real_stream_name` FROM `$this->eventStreamsTable`
 $whereCondition
 ORDER BY `real_stream_name` ASC
 LIMIT $offset, $limit
@@ -567,7 +567,7 @@ public function fetchCategoryNames(?string $filter, int $limit = 20, int $offset
         }
 
         $query = <<<SQL
-SELECT `category` FROM $this->eventStreamsTable
+SELECT `category` FROM `$this->eventStreamsTable`
 $whereCondition
 GROUP BY `category`
 ORDER BY `category` ASC
@@ -613,7 +613,7 @@ public function fetchCategoryNamesRegex(string $filter, int $limit = 20, int $of
         $whereCondition = 'WHERE `category` REGEXP :filter AND `category` IS NOT NULL';
 
         $query = <<<SQL
-SELECT `category` FROM $this->eventStreamsTable
+SELECT `category` FROM `$this->eventStreamsTable`
 $whereCondition
 GROUP BY `category`
 ORDER BY `category` ASC
@@ -737,7 +737,7 @@ private function addStreamToStreamsTable(Stream $stream): void
         $metadata = json_encode($stream->metadata());
 
         $sql = <<<EOT
-INSERT INTO $this->eventStreamsTable (real_stream_name, stream_name, metadata, category)
+INSERT INTO `$this->eventStreamsTable` (real_stream_name, stream_name, metadata, category)
 VALUES (:realStreamName, :streamName, :metadata, :category);
 EOT;
 
@@ -770,7 +770,7 @@ private function addStreamToStreamsTable(Stream $stream): void
     private function removeStreamFromStreamsTable(StreamName $streamName): void
     {
         $deleteEventStreamTableEntrySql = <<<EOT
-DELETE FROM $this->eventStreamsTable WHERE real_stream_name = ?;
+DELETE FROM `$this->eventStreamsTable` WHERE real_stream_name = ?;
 EOT;
 
         $statement = $this->connection->prepare($deleteEventStreamTableEntrySql);

diff --git a/src/PersistenceStrategy/PostgresAggregateStreamStrategy.php b/src/PersistenceStrategy/PostgresAggregateStreamStrategy.php
@@ -26,7 +26,7 @@ final class PostgresAggregateStreamStrategy implements PersistenceStrategy
     public function createSchema(string $tableName): array
     {
         $statement = <<<EOT
-CREATE TABLE $tableName (
+CREATE TABLE "$tableName" (
     no BIGSERIAL,
     event_id UUID NOT NULL,
     event_name VARCHAR(100) NOT NULL,
@@ -40,7 +40,7 @@ public function createSchema(string $tableName): array
 
         return [
             $statement,
-            "CREATE UNIQUE INDEX on $tableName ((metadata->>'_aggregate_version'));",
+            "CREATE UNIQUE INDEX on \"$tableName\" ((metadata->>'_aggregate_version'));",
         ];
     }
 

diff --git a/src/PersistenceStrategy/PostgresSimpleStreamStrategy.php b/src/PersistenceStrategy/PostgresSimpleStreamStrategy.php
@@ -25,7 +25,7 @@ final class PostgresSimpleStreamStrategy implements PersistenceStrategy
     public function createSchema(string $tableName): array
     {
         $statement = <<<EOT
-CREATE TABLE $tableName (
+CREATE TABLE "$tableName" (
     no BIGSERIAL,
     event_id UUID NOT NULL,
     event_name VARCHAR(100) NOT NULL,

diff --git a/src/PersistenceStrategy/PostgresSingleStreamStrategy.php b/src/PersistenceStrategy/PostgresSingleStreamStrategy.php
@@ -25,7 +25,7 @@ final class PostgresSingleStreamStrategy implements PersistenceStrategy
     public function createSchema(string $tableName): array
     {
         $statement = <<<EOT
-CREATE TABLE $tableName (
+CREATE TABLE "$tableName" (
     no BIGSERIAL,
     event_id UUID NOT NULL,
     event_name VARCHAR(100) NOT NULL,
@@ -41,12 +41,12 @@ public function createSchema(string $tableName): array
 EOT;
 
         $index1 = <<<EOT
-CREATE UNIQUE INDEX ON $tableName
+CREATE UNIQUE INDEX ON "$tableName"
 ((metadata->>'_aggregate_type'), (metadata->>'_aggregate_id'), (metadata->>'_aggregate_version'));
 EOT;
 
         $index2 = <<<EOT
-CREATE INDEX ON $tableName
+CREATE INDEX ON "$tableName"
 ((metadata->>'_aggregate_type'), (metadata->>'_aggregate_id'), no);
 EOT;