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

rename calendarobjects_properties -> calendarobjects_props 

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
pull/4098/head
Georg Ehrke 2017-04-26 10:06:10 +07:00
parent 8d00458b56
commit 0f8a9514de
No known key found for this signature in database
GPG Key ID: 9D98FD9380A1CB43
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/appinfo/database.xml
Unescape Escape View File

@ -671,7 +671,7 @@ CREATE TABLE calendarobjects (
</table>
<table>
<name>*dbprefix*calendarobjects_properties</name>
<name>*dbprefix*calendarobjects_props</name>
<declaration>
<field>
<name>id</name>

4
apps/dav/lib/CalDAV/CalDavBackend.php
Unescape Escape View File

@ -149,7 +149,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
private $legacyEndpoint;
/** @var string */
private $dbObjectPropertiesTable = 'calendarobjects_properties';
private $dbObjectPropertiesTable = 'calendarobjects_props';
/**
* CalDavBackend constructor.
@ -1286,7 +1286,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
}
$query->select(['c.calendarid', 'c.uri'])
->from('calendarobjects_properties', 'i')
->from($this->dbObjectPropertiesTable, 'i')
->join('i', 'calendarobjects', 'c', $query->expr()->eq('i.objectid', 'c.id'))
->where($calExpr)
->andWhere($compExpr)