[jan] Fix updating large files in Oracle backends.

horde · Dec 14, 2015 · 0025def · 0025def
1 parent 90a73b5
commit 0025def
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/framework/SessionHandler/package.xml b/framework/SessionHandler/package.xml
@@ -33,6 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
+* [jan] Fix updating large files in Oracle backends.
 * [jan] Fix writing big session data to Oracle (Bug #14175).
  </notes>
  <contents>
@@ -131,7 +132,7 @@
    <package>
     <name>Horde_Db</name>
     <channel>pear.horde.org</channel>
-    <min>2.0.3</min>
+    <min>2.2.0</min>
     <max>3.0.0alpha1</max>
     <exclude>3.0.0alpha1</exclude>
    </package>
@@ -590,6 +591,7 @@ Initial release as a PEAR package
    <date>2015-10-20</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
+* [jan] Fix updating large files in Oracle backends.
 * [jan] Fix writing big session data to Oracle (Bug #14175).
    </notes>
   </release>

diff --git a/framework/Vfs/lib/Horde/Vfs/Sql.php b/framework/Vfs/lib/Horde/Vfs/Sql.php
@@ -753,32 +753,26 @@ protected function _insertBlob($table, $field, $data, $attributes)
      */
     protected function _updateBlob($table, $field, $data, $where, $alsoupdate)
     {
-        $updatestring = '';
-        $values = array();
-        foreach ($alsoupdate as $key => $value) {
-            $updatestring .= $key . ' = ?, ';
-            $values[] = $value;
-        }
-        $updatestring .= $field . ' = ?';
-        $values[] = new Horde_Db_Value_Binary($data);
-
         $wherestring = '';
+        $wherevalues = array();
         foreach ($where as $key => $value) {
             if (!empty($wherestring)) {
                 $wherestring .= ' AND ';
             }
             $wherestring .= $key . ' = ?';
-            $values[] = $value;
+            $wherevalues[] = $value;
         }
 
-        $query = sprintf('UPDATE %s SET %s WHERE %s',
-                         $table,
-                         $updatestring,
-                         $wherestring);
-
         /* Execute the query. */
         try {
-            $this->_db->update($query, $values);
+            $this->_db->updateBlob(
+                $table,
+                array_merge(
+                    $alsoupdate,
+                    array($field => new Horde_Db_Value_Binary($data))
+                ),
+                array($wherestring, $wherevalues)
+            );
         } catch (Horde_Db_Exception $e) {
             throw new Horde_Vfs_Exception($e);
         }

diff --git a/framework/Vfs/package.xml b/framework/Vfs/package.xml
@@ -437,7 +437,7 @@ Reading, writing and listing of files are all supported.</description>
    <package>
     <name>Horde_Db</name>
     <channel>pear.horde.org</channel>
-    <min>2.1.0</min>
+    <min>2.2.0</min>
     <max>3.0.0alpha1</max>
     <exclude>3.0.0alpha1</exclude>
    </package>

diff --git a/framework/Vfs/test/Horde/Vfs/Sql/Oci8Test.php b/framework/Vfs/test/Horde/Vfs/Sql/Oci8Test.php
@@ -31,4 +31,12 @@ public static function setUpBeforeClass()
             self::$reason = 'No oci8 configuration';
         }
     }
+
+    public function testWriteLargeData()
+    {
+        // Write twice to test both INSERT and UPDATE.
+        self::$vfs->writeData('', 'large', str_repeat('x', 4001));
+        self::$vfs->writeData('', 'large', str_repeat('x', 4001));
+        self::$vfs->deleteFile('', 'large');
+    }
 }