diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-25 21:13:41 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-25 21:13:41 +0100 |
| commit | 4c9e328211a3f986cd2c6186e4c1de755d5c940b (patch) | |
| tree | 53e4b5a23366f59ddc2bcfc15013d6ceeb9efebb /apps | |
| parent | fe08700b597b8c765716e92569d30524cfef9b84 (diff) | |
| parent | 09ae1604637127189e7aaf6777243e8b84a89dd8 (diff) | |
| download | nextcloud-server-4c9e328211a3f986cd2c6186e4c1de755d5c940b.tar.gz nextcloud-server-4c9e328211a3f986cd2c6186e4c1de755d5c940b.zip | |
Merge pull request #21892 from owncloud/issue-21890-parameters
Add parameters types to IQueryBuilder
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/lib/caldav/caldavbackend.php | 3 | ||||
| -rw-r--r-- | apps/dav/lib/carddav/carddavbackend.php | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/apps/dav/lib/caldav/caldavbackend.php b/apps/dav/lib/caldav/caldavbackend.php index 6af75ca064c..0b70b37967f 100644 --- a/apps/dav/lib/caldav/caldavbackend.php +++ b/apps/dav/lib/caldav/caldavbackend.php @@ -22,6 +22,7 @@ namespace OCA\DAV\CalDAV; +use OCP\DB\QueryBuilder\IQueryBuilder; use Sabre\CalDAV\Backend\AbstractBackend; use Sabre\CalDAV\Backend\SchedulingSupport; use Sabre\CalDAV\Backend\SubscriptionSupport; @@ -384,7 +385,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription ->from('calendarobjects') ->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId))) ->andWhere($query->expr()->in('uri', $query->createParameter('uri'))) - ->setParameter('uri', $uris, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY); + ->setParameter('uri', $uris, IQueryBuilder::PARAM_STR_ARRAY); $stmt = $query->execute(); diff --git a/apps/dav/lib/carddav/carddavbackend.php b/apps/dav/lib/carddav/carddavbackend.php index 97067abb7c3..44164e61259 100644 --- a/apps/dav/lib/carddav/carddavbackend.php +++ b/apps/dav/lib/carddav/carddavbackend.php @@ -25,6 +25,7 @@ namespace OCA\DAV\CardDAV; use OCA\DAV\Connector\Sabre\Principal; +use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; use Sabre\CardDAV\Backend\BackendInterface; use Sabre\CardDAV\Backend\SyncSupport; @@ -118,7 +119,7 @@ class CardDavBackend implements BackendInterface, SyncSupport { ->where($query->expr()->in('s.principaluri', $query->createParameter('principaluri'))) ->andWhere($query->expr()->eq('s.type', $query->createParameter('type'))) ->setParameter('type', 'addressbook') - ->setParameter('principaluri', $principals, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY) + ->setParameter('principaluri', $principals, IQueryBuilder::PARAM_STR_ARRAY) ->execute(); while($row = $result->fetch()) { @@ -423,7 +424,7 @@ class CardDavBackend implements BackendInterface, SyncSupport { ->from('cards') ->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId))) ->andWhere($query->expr()->in('uri', $query->createParameter('uri'))) - ->setParameter('uri', $uris, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY); + ->setParameter('uri', $uris, IQueryBuilder::PARAM_STR_ARRAY); $cards = []; |