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

Close cursors

This commit is contained in:
Joas Schilling 2016-09-15 09:47:39 +02:00
parent 5b8c7768b1
commit 884e538575
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/dav/lib/CalDAV/CalDavBackend.php
View File

@ -572,7 +572,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
} }
$chunks = array_chunk($uris, 100); $chunks = array_chunk($uris, 100);
$result = []; $objects = [];
$query = $this->db->getQueryBuilder(); $query = $this->db->getQueryBuilder();
$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification']) $query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification'])
@ -582,10 +582,10 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
foreach ($chunks as $uris) { foreach ($chunks as $uris) {
$query->setParameter('uri', $uris, IQueryBuilder::PARAM_STR_ARRAY); $query->setParameter('uri', $uris, IQueryBuilder::PARAM_STR_ARRAY);
$stmt = $query->execute(); $result = $query->execute();
while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) { while ($row = $result->fetch()) {
$result[] = [ $objects[] = [
'id' => $row['id'], 'id' => $row['id'],
'uri' => $row['uri'], 'uri' => $row['uri'],
'lastmodified' => $row['lastmodified'], 'lastmodified' => $row['lastmodified'],
@ -597,8 +597,9 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
'classification' => (int)$row['classification'] 'classification' => (int)$row['classification']
]; ];
} }
$result->closeCursor();
} }
return $result; return $objects;
} }
/** /**

3
apps/dav/lib/CardDAV/CardDavBackend.php
View File

@ -456,11 +456,12 @@ class CardDavBackend implements BackendInterface, SyncSupport {
$query->setParameter('uri', $uris, IQueryBuilder::PARAM_STR_ARRAY); $query->setParameter('uri', $uris, IQueryBuilder::PARAM_STR_ARRAY);
$result = $query->execute(); $result = $query->execute();
while($row = $result->fetch()) { while ($row = $result->fetch()) {
$row['etag'] = '"' . $row['etag'] . '"'; $row['etag'] = '"' . $row['etag'] . '"';
$row['carddata'] = $this->readBlob($row['carddata']); $row['carddata'] = $this->readBlob($row['carddata']);
$cards[] = $row; $cards[] = $row;
} }
$result->closeCursor();
} }
return $cards; return $cards;
} }