Unset prior fetched rows

amphp · Jun 28, 2018 · 419279e · 419279e
1 parent 0c6631e
commit 419279e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/Internal/ResultProxy.php b/src/Internal/ResultProxy.php
@@ -35,7 +35,7 @@ public function setColumns(int $columns) {
 
     public function updateState(int $state) {
         $this->state = $state;
-        if ($state == ResultProxy::ROWS_FETCHED) {
+        if ($state === self::ROWS_FETCHED) {
             $this->rowFetched(null);
         }
         if (empty($this->deferreds[$state])) {
@@ -51,9 +51,9 @@ public function rowFetched($row) {
         if ($row !== null) {
             $this->rows[$this->fetchedRows++] = $row;
         }
-        list($entry, , $cb) = current($this->deferreds[ResultProxy::SINGLE_ROW_FETCH]);
+        list($entry, , $cb) = current($this->deferreds[self::SINGLE_ROW_FETCH]);
         if ($entry !== null) {
-            unset($this->deferreds[ResultProxy::SINGLE_ROW_FETCH][key($this->deferreds[ResultProxy::SINGLE_ROW_FETCH])]);
+            unset($this->deferreds[self::SINGLE_ROW_FETCH][key($this->deferreds[self::SINGLE_ROW_FETCH])]);
             $entry->resolve($cb && $row ? $cb($row) : $row);
         }
     }

diff --git a/src/ResultSet.php b/src/ResultSet.php
@@ -116,7 +116,10 @@ public function getCurrent() {
 
     private static function fetchRow(Internal\ResultProxy $result): Promise {
         if ($result->userFetched < $result->fetchedRows) {
-            return new Success($result->rows[$result->userFetched++]);
+            $row = $result->rows[$result->userFetched];
+            unset($result->rows[$result->userFetched]);
+            $result->userFetched++;
+            return new Success($row);
         }
 
         if ($result->state === Internal\ResultProxy::ROWS_FETCHED) {