Fix streams with PostgreSQL (Request #10805).

horde · Feb 6, 2017 · 5c2ec0d · 5c2ec0d
1 parent 8867906
commit 5c2ec0d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/framework/Db/lib/Horde/Db/Adapter/Pdo/Base.php b/framework/Db/lib/Horde/Db/Adapter/Pdo/Base.php
@@ -262,6 +262,7 @@ protected function _executePrepared($sql, $values, $binary_values)
         try {
             $stmt = $this->_connection->prepare($query);
             foreach ($binary_values as $key => $bvalue) {
+                rewind($bvalue);
                 $stmt->bindParam(':binary' . $key, $bvalue, PDO::PARAM_LOB);
             }
         } catch (PDOException $e) {
@@ -311,7 +312,8 @@ public function insertBlob($table, $fields, $pk = null, $idValue = null)
         $placeholders = $values = $binary = array();
         $binary_cnt = 0;
         foreach ($fields as $name => $value) {
-            if ($value instanceof Horde_Db_Value) {
+            if (is_object($value) &&
+                get_class($value) == 'Horde_Db_Value_Binary') {
                 $placeholders[] = ':binary' . $binary_cnt++;
                 $binary[] = $value->stream;
             } else {

diff --git a/framework/Db/lib/Horde/Db/Adapter/Postgresql/Column.php b/framework/Db/lib/Horde/Db/Adapter/Postgresql/Column.php
@@ -172,6 +172,7 @@ protected function _extractValueFromDefault($default)
     public function binaryToString($value)
     {
         if (is_resource($value)) {
+            rewind($value);
             $string = stream_get_contents($value);
             fclose($value);
             return $string;