Adding upstream version 1.11.1.upstream/1.11.1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 16 insertions, 1 deletions

diff --git a/library/Director/Db/Branch/BranchStore.php b/library/Director/Db/Branch/BranchStore.php
index 196d079..13971b9 100644
--- a/library/Director/Db/Branch/BranchStore.php
+++ b/library/Director/Db/Branch/BranchStore.php
@@ -56,6 +56,7 @@ class BranchStore
                 $rows = $db->fetchAll($db->select()->from($table)->where('branch_uuid = ?', $oldQuotedUuid));
                 foreach ($rows as $row) {
                     $modified = (array)$row;
+                    $this->quoteBinaryProperties($modified);
                     $modified['branch_uuid'] = $quotedUuid;
                     if ($table === self::TABLE_ACTIVITY) {
                         $modified['timestamp_ns'] = round($modified['timestamp_ns'] / 1000000);
@@ -68,6 +69,21 @@ class BranchStore
         return $this->fetchBranchByName($newName);
     }
 
+    protected function quoteBinaryProperties(&$properties)
+    {
+        foreach ($properties as $key => $value) {
+            if ($this->isBinaryColumn($key)) {
+                $properties[$key] = $this->connection->quoteBinary($value);
+            }
+        }
+    }
+
+    protected function isBinaryColumn($key)
+    {
+        return (strpos($key, 'uuid') !== false || strpos($key, 'checksum') !== false)
+            && strpos($key, 'hex') === false;
+    }
+
     protected function runTransaction($callback)
     {
         $db = $this->db;
@@ -100,7 +116,6 @@ class BranchStore
                 }
             }
         });
-
     }
 
     protected function newFromDbResult($query)