Fix writing BLOBs to postgres with recent contacts interaction

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

diff --git a/apps/contactsinteraction/lib/Db/RecentContact.php b/apps/contactsinteraction/lib/Db/RecentContact.php
index 475de0934197860627cb5d4413d5e42e313e54f0..e6c379d0aa15b6fa55bc7e8883da0f3103321273 100644 (file)
--- a/apps/contactsinteraction/lib/Db/RecentContact.php
+++ b/apps/contactsinteraction/lib/Db/RecentContact.php
@@ -66,7 +66,7 @@ class RecentContact extends Entity {
                $this->addType('uid', 'string');
                $this->addType('email', 'string');
                $this->addType('federatedCloudId', 'string');
-               $this->addType('card', 'string');
+               $this->addType('card', 'blob');
                $this->addType('lastContact', 'int');
        }
 }

diff --git a/lib/public/AppFramework/Db/Entity.php b/lib/public/AppFramework/Db/Entity.php
index 954b8787c4c6400106c067ed8bea157610b13c17..34719c82aea7601207a6f095719594687fbbf60e 100644 (file)
--- a/lib/public/AppFramework/Db/Entity.php
+++ b/lib/public/AppFramework/Db/Entity.php
@@ -110,7 +110,12 @@ abstract class Entity {
 
                        // if type definition exists, cast to correct type
                        if ($args[0] !== null && array_key_exists($name, $this->_fieldTypes)) {
-                               settype($args[0], $this->_fieldTypes[$name]);
+                               $type = $this->_fieldTypes[$name];
+                               if ($type === 'blob') {
+                                       // (B)LOB is treated as string when we read from the DB
+                                       $type = 'string';
+                               }
+                               settype($args[0], $type);
                        }
                        $this->$name = $args[0];
                } else {

diff --git a/lib/public/AppFramework/Db/QBMapper.php b/lib/public/AppFramework/Db/QBMapper.php
index 9b396965706d75b8107a40c82e0311c5cd421a9c..ebbe92e7875f7c73a4e1844645e88f21377e2af6 100644 (file)
--- a/lib/public/AppFramework/Db/QBMapper.php
+++ b/lib/public/AppFramework/Db/QBMapper.php
@@ -230,6 +230,8 @@ abstract class QBMapper {
                        case 'bool':
                        case 'boolean':
                                return IQueryBuilder::PARAM_BOOL;
+                       case 'blob':
+                               return IQueryBuilder::PARAM_LOB;
                }
 
                return IQueryBuilder::PARAM_STR;