sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Close cursors

pull/1408/head
Joas Schilling 2016-09-15 09:47:39 +07:00
parent 08c6ca5a1a
commit 44fbf6f734
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
Unescape Escape View File

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

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

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