diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-15 12:13:54 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-15 12:13:54 +0100 |
| commit | 99de93a6c6e6a78d36f0d5bed41538e9739b32c5 (patch) | |
| tree | 064f06de021b1665699f29b57601e41a7dfc3c3e /apps/dav | |
| parent | 4159187a6e78c2285d4aebdfd7a1504d74e52a71 (diff) | |
| parent | 09febaad4940af5a4c0b00434867b54c5384f4c4 (diff) | |
| download | nextcloud-server-99de93a6c6e6a78d36f0d5bed41538e9739b32c5.tar.gz nextcloud-server-99de93a6c6e6a78d36f0d5bed41538e9739b32c5.zip | |
Merge pull request #23075 from owncloud/backport-23074-oracle-ext-storage
[9.0] Correctly escape join statements and use selectAlias
Diffstat (limited to 'apps/dav')
| -rw-r--r-- | apps/dav/lib/caldav/caldavbackend.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/dav/lib/caldav/caldavbackend.php b/apps/dav/lib/caldav/caldavbackend.php index fdfc8c399ed..bb50100d9a2 100644 --- a/apps/dav/lib/caldav/caldavbackend.php +++ b/apps/dav/lib/caldav/caldavbackend.php @@ -815,9 +815,9 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription function getCalendarObjectByUID($principalUri, $uid) { $query = $this->db->getQueryBuilder(); - $query->select([$query->createFunction('c.`uri` AS `calendaruri`'), $query->createFunction('co.`uri` AS `objecturi`')]) + $query->selectAlias('c.uri', 'calendaruri')->selectAlias('co.uri', 'objecturi') ->from('calendarobjects', 'co') - ->leftJoin('co', 'calendars', 'c', 'co.`calendarid` = c.`id`') + ->leftJoin('co', 'calendars', 'c', $query->expr()->eq('co.calendarid', 'c.id')) ->where($query->expr()->eq('c.principaluri', $query->createNamedParameter($principalUri))) ->andWhere($query->expr()->eq('co.uid', $query->createNamedParameter($uid))); |