Restore stream offsets with subsequent execute

Driver statement instances needs to maintain resources offsets for
streams passed to bindValue after the first call to execute.

Modified array compare in testBindValueResetsStream to explicitly
read the stream.

Fixed for PDO, SQLite3

Author: mcurland

src/Driver/PDO/Statement.php

@@ -54,7 +54,7 @@ public function bindValue($param, $value, $type = ParameterType::STRING)
 
         $pdoType = ParameterTypeMap::convertParamType($type);
         if ($pdoType === PDO::PARAM_LOB) {
-            $this->trackParamResource($value);
+            $this->trackParamResource($param, $value);
         }
 
         try {
@@ -157,16 +157,17 @@ public function execute($params = null): ResultInterface
      * Track a binary parameter reference at binding time. These
      * are cached for later analysis by the getResourceOffsets.
      *
-     * @param mixed $resource
+     * @param int|string $param
+     * @param mixed      $resource
      */
-    private function trackParamResource($resource): void
+    private function trackParamResource($param, $resource): void
     {
         if (! is_resource($resource)) {
             return;
         }
 
-        $this->paramResources ??= [];
-        $this->paramResources[] = $resource;
+        $this->paramResources       ??= [];
+        $this->paramResources[$param] = $resource;
     }
 
     /**
@@ -218,7 +219,5 @@ private function restoreResourceOffsets(?array $resourceOffsets): void
         foreach ($resourceOffsets as $index => $offset) {
             fseek($this->paramResources[$index], $offset, SEEK_SET);
         }
-
-        $this->paramResources = null;
     }
 }

src/Driver/SQLite3/Statement.php

@@ -68,7 +68,7 @@ public function bindValue($param, $value, $type = ParameterType::STRING): bool
 
         $sqliteType = $this->convertParamType($type);
         if ($sqliteType === SQLITE3_BLOB) {
-            $this->trackParamResource($value);
+            $this->trackParamResource($param, $value);
         }
 
         return $this->statement->bindValue($param, $value, $sqliteType);
@@ -156,16 +156,17 @@ private function convertParamType(int $type): int
      * Track a binary parameter reference at binding time. These
      * are cached for later analysis by the getResourceOffsets.
      *
-     * @param mixed $resource
+     * @param int|string $param
+     * @param mixed      $resource
      */
-    private function trackParamResource($resource): void
+    private function trackParamResource($param, $resource): void
     {
         if (! is_resource($resource)) {
             return;
         }
 
-        $this->paramResources ??= [];
-        $this->paramResources[] = $resource;
+        $this->paramResources       ??= [];
+        $this->paramResources[$param] = $resource;
     }
 
     /**
@@ -217,7 +218,5 @@ private function restoreResourceOffsets(?array $resourceOffsets): void
         foreach ($resourceOffsets as $index => $offset) {
             fseek($this->paramResources[$index], $offset, SEEK_SET);
         }
-
-        $this->paramResources = null;
     }
 }

tests/Functional/BlobTest.php

@@ -229,10 +229,12 @@ public function testBindValueResetsStream(): void
         $stmt->bindValue(1, 3, ParameterType::INTEGER);
         $stmt->executeStatement();
 
+        $blobType = Type::getType(Types::BLOB);
+        $platform = $this->connection->getDatabasePlatform();
         $rows = array_map(
-            function (array $row): array {
+            function (array $row) use ($blobType, $platform): array {
                 $row[0] = $this->connection->convertToPHPValue($row[0], Types::INTEGER);
-                $row[1] = $this->connection->convertToPHPValue($row[1], Types::STRING);
+                $row[1] = stream_get_contents($blobType->convertToPHPValue($row[1], $platform));
 
                 return $row;
             },