From eecb3cddf06f0fe3ceee861af29dd371124095e2 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 2 Mar 2016 21:40:12 +0100
Subject: [PATCH] Db: fetch less binary data

---
 .../views/scripts/show/activitylog.phtml      |  2 +-
 library/Director/Db.php                       | 56 ++++++++++---------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/application/views/scripts/show/activitylog.phtml b/application/views/scripts/show/activitylog.phtml
index f3829f06..7a332dc4 100644
--- a/application/views/scripts/show/activitylog.phtml
+++ b/application/views/scripts/show/activitylog.phtml
@@ -60,7 +60,7 @@ $url = $this->url()->without('checksum')->without('show');
 <?php endif ?>
   <tr>
     <th><?= $this->translate('Checksum') ?></th>
-    <td><?= bin2hex($this->entry->checksum) ?></td>
+    <td><?= $this->entry->checksum ?></td>
   </tr>
 </table>
 <?php if (! empty($this->output)): ?>
diff --git a/library/Director/Db.php b/library/Director/Db.php
index 0d9fccf9..0ed92de9 100644
--- a/library/Director/Db.php
+++ b/library/Director/Db.php
@@ -181,14 +181,19 @@ class Db extends DbConnection
 
     public function fetchActivityLogEntryById($id)
     {
-        $sql = 'SELECT * FROM director_activity_log WHERE id = ' . (int) $id;
+        $sql = 'SELECT id, object_type, object_name, action_name,'
+             . ' old_properties, new_properties, author, change_time,'
+             . ' %s AS checksum, %s AS parent_checksum'
+             . ' FROM director_activity_log WHERE id = %d';
 
-        $result = $this->db()->fetchRow($sql);
-        if (is_resource($result->checksum)) {
-            $result->checksum = stream_get_contents($result->checksum);
-        }
+        $sql = sprintf(
+            $sql,
+            $this->dbHexFunc('checksum'),
+            $this->dbHexFunc('parent_checksum'),
+            $id
+        );
 
-        return $result;
+        return $this->db()->fetchRow($sql);
     }
 
     public function fetchActivityLogChecksumById($id, $binary = true)
@@ -222,31 +227,21 @@ class Db extends DbConnection
             $checksum = new Zend_Db_Expr("\\x" . bin2hex($checksum));
         }
 
-        $sql = 'SELECT * FROM director_activity_log WHERE checksum = ?';
-        $ret = $this->db()->fetchRow($sql, $checksum);
+        $sql = 'SELECT id, object_type, object_name, action_name'
+             . ' old_properties, new_properties, author, change_time'
+             . ' %s AS checksum, %s AS parent_checksum'
+             . ' FROM director_activity_log WHERE checksum = ?';
 
-        if (is_resource($ret->checksum)) {
-            $ret->checksum = stream_get_contents($ret->checksum);
-        }
-
-        if (is_resource($ret->parent_checksum)) {
-            $ret->checksum = stream_get_contents($ret->parent_checksum);
-        }
-
-        return $ret;
+        return $this->db()->fetchRow($sql, $checksum);
     }
 
     public function getLastActivityChecksum()
     {
-        if ($this->isPgsql()) {
-            $select = "SELECT checksum FROM (SELECT * FROM (SELECT 1 AS pos, LOWER(ENCODE(checksum, 'hex')) AS checksum"
-                    . " FROM director_activity_log ORDER BY id DESC LIMIT 1) a"
-                    . " UNION SELECT 2 AS pos, '' AS checksum) u ORDER BY pos LIMIT 1";
-        } else {
-            $select = "SELECT checksum FROM (SELECT * FROM (SELECT 1 AS pos, LOWER(HEX(checksum)) AS checksum"
-                    . " FROM director_activity_log ORDER BY id DESC LIMIT 1) a"
-                    . " UNION SELECT 2 AS pos, '' AS checksum) u ORDER BY pos LIMIT 1";
-        }
+        $select = "SELECT checksum FROM (SELECT * FROM (SELECT 1 AS pos, "
+                . $this->dbHexFunc('checksum')
+                . " AS checksum"
+                . " FROM director_activity_log ORDER BY id DESC LIMIT 1) a"
+                . " UNION SELECT 2 AS pos, '' AS checksum) u ORDER BY pos LIMIT 1";
 
         return $this->db()->fetchOne($select);
     }
@@ -670,6 +665,15 @@ class Db extends DbConnection
         return $this->getDbType() === 'pgsql';
     }
 
+    protected function dbHexFunc($column)
+    {
+        if ($this->isPgsql()) {
+            return sprintf("LOWER(ENCODE(%s, 'hex'))", $column);
+        } else {
+            return sprintf("LOWER(HEX(%s))", $column);
+        }
+    }
+
     public function getUncollectedDeployments()
     {
         $db = $this->db();