From 0f8a9514de445c47a79d18a3ca075295398b4c60 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 26 Apr 2017 10:06:10 +0200 Subject: rename calendarobjects_properties -> calendarobjects_props Signed-off-by: Georg Ehrke --- apps/dav/appinfo/database.xml | 2 +- apps/dav/lib/CalDAV/CalDavBackend.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'apps/dav') diff --git a/apps/dav/appinfo/database.xml b/apps/dav/appinfo/database.xml index de87f02e8f8..b3a69de070c 100644 --- a/apps/dav/appinfo/database.xml +++ b/apps/dav/appinfo/database.xml @@ -671,7 +671,7 @@ CREATE TABLE calendarobjects ( - *dbprefix*calendarobjects_properties + *dbprefix*calendarobjects_props id diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index a2b7a2e83b2..fcf73cb0f31 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -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) -- cgit v1.2.3