From 2fff34f0eefb80ac14f9d59bbda1ec89d8171aeb Mon Sep 17 00:00:00 2001
From: prolic <saschaprolic@googlemail.com>
Date: Sat, 10 Jun 2017 00:57:08 +0800
Subject: [PATCH 1/3] fix for load/save within same transaction

---
 src/PostgresEventStore.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/PostgresEventStore.php b/src/PostgresEventStore.php
index 95c31dc0..2125306e 100644
--- a/src/PostgresEventStore.php
+++ b/src/PostgresEventStore.php
@@ -219,6 +219,17 @@ public function load(
         int $count = null,
         MetadataMatcher $metadataMatcher = null
     ): Iterator {
+        $tableName = $this->persistenceStrategy->generateTableName($streamName);
+
+        $query = "SELECT stream_name FROM $this->eventStreamsTable WHERE stream_name = ?";
+
+        $statement = $this->connection->prepare($query);
+        $statement->execute([$tableName]);
+
+        if ($statement->rowCount() === 0) {
+            throw StreamNotFound::with($streamName);
+        }
+
         [$where, $values] = $this->createWhereClause($metadataMatcher);
         $where[] = 'no >= :fromNumber';
 
@@ -230,8 +241,6 @@ public function load(
             $limit = min($count, $this->loadBatchSize);
         }
 
-        $tableName = $this->persistenceStrategy->generateTableName($streamName);
-
         $query = <<<EOT
 SELECT * FROM $tableName
 $whereCondition

From a6b8f1e4696321cdff08c3382ae350c0a385c266 Mon Sep 17 00:00:00 2001
From: prolic <saschaprolic@googlemail.com>
Date: Sat, 10 Jun 2017 01:06:04 +0800
Subject: [PATCH 2/3] apply php cs fixes

---
 src/PostgresEventStore.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/PostgresEventStore.php b/src/PostgresEventStore.php
index 2125306e..cf15686a 100644
--- a/src/PostgresEventStore.php
+++ b/src/PostgresEventStore.php
@@ -229,7 +229,6 @@ public function load(
         if ($statement->rowCount() === 0) {
             throw StreamNotFound::with($streamName);
         }
-
         [$where, $values] = $this->createWhereClause($metadataMatcher);
         $where[] = 'no >= :fromNumber';
 

From a53714450811236d212fdd84e81bf39eb6b4a806 Mon Sep 17 00:00:00 2001
From: Sascha-Oliver Prolic <saschaprolic@googlemail.com>
Date: Sun, 18 Jun 2017 22:29:11 +0800
Subject: [PATCH 3/3] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 88cfaf3c..c54c759f 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
     "prefer-stable": true,
     "require": {
         "php": "^7.1",
-        "prooph/event-store": "^7.1.0"
+        "prooph/event-store": "^7.1.1"
     },
     "require-dev": {
         "sandrokeil/interop-config": "^2.0.1",