mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22515 from nextcloud/backport/22472/stable19 

[stable19] Fix writing BLOBs to postgres with recent contacts interaction
This commit is contained in:
Roeland Jago Douma 2020-09-04 12:38:16 +02:00 committed by GitHub
parent c1b971ec63 7ada6e5ab0
commit dc60a81284
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/contactsinteraction/lib/Db/RecentContact.php
View File

@ -66,7 +66,7 @@ class RecentContact extends Entity {
$this->addType('uid', 'string'); $this->addType('uid', 'string');
$this->addType('email', 'string'); $this->addType('email', 'string');
$this->addType('federatedCloudId', 'string'); $this->addType('federatedCloudId', 'string');
$this->addType('card', 'string'); $this->addType('card', 'blob');
$this->addType('lastContact', 'int'); $this->addType('lastContact', 'int');
} }
} }

7
lib/public/AppFramework/Db/Entity.php
View File

@ -110,7 +110,12 @@ abstract class Entity {
// if type definition exists, cast to correct type // if type definition exists, cast to correct type
if ($args[0] !== null && array_key_exists($name, $this->_fieldTypes)) { 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]; $this->$name = $args[0];
} else { } else {

2
lib/public/AppFramework/Db/QBMapper.php
View File

@ -230,6 +230,8 @@ abstract class QBMapper {
case 'bool': case 'bool':
case 'boolean': case 'boolean':
return IQueryBuilder::PARAM_BOOL; return IQueryBuilder::PARAM_BOOL;
case 'blob':
return IQueryBuilder::PARAM_LOB;
} }
return IQueryBuilder::PARAM_STR; return IQueryBuilder::PARAM_STR;