nextcloud · MorrisJobke · Jul 12, 2018 · Jul 12, 2018 · Jul 12, 2018
diff --git a/apps/dav/lib/BackgroundJob/CleanupInvitationTokenJob.php b/apps/dav/lib/BackgroundJob/CleanupInvitationTokenJob.php
@@ -45,7 +45,7 @@ public function __construct(IDBConnection $db, ITimeFactory $timeFactory) {
 
 	public function run($argument) {
 		$query = $this->db->getQueryBuilder();
-		$query->delete('calendar_invitation_tokens')
+		$query->delete('calendar_invitations')
 			->where($query->expr()->lt('expiration',
 				$query->createNamedParameter($this->timeFactory->getTime())))
 			->execute();

diff --git a/apps/dav/lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php b/apps/dav/lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php
@@ -72,9 +72,9 @@ public function __construct(IResourceManager $resourceManager, IRoomManager $roo
 		$this->roomManager = $roomManager;
 		$this->db = $dbConnection;
 		$this->calDavBackend = $calDavBackend;
-		$this->resourceDbTable = 'calendar_resources_cache';
+		$this->resourceDbTable = 'calendar_resources';
 		$this->resourcePrincipalUri = 'principals/calendar-resources';
-		$this->roomDbTable = 'calendar_rooms_cache';
+		$this->roomDbTable = 'calendar_rooms';
 		$this->roomPrincipalUri = 'principals/calendar-rooms';
 
 		// run once an hour

@@ -68,7 +68,7 @@ public function __construct(IDBConnection $dbConnection,
 		$this->groupManager = $groupManager;
 		$this->logger = $logger;
 		$this->principalPrefix = $principalPrefix;
-		$this->dbTableName = 'calendar_' . $dbPrefix . '_cache';
+		$this->dbTableName = 'calendar_' . $dbPrefix;
 	}
 
 	/**

@@ -536,7 +536,7 @@ private function createInvitationToken(Message $iTipMessage, $lastOccurrence):st
 		$uid = $vevent->{'UID'};
 
 		$query = $this->db->getQueryBuilder();
-		$query->insert('calendar_invitation_tokens')
+		$query->insert('calendar_invitations')
 			->values([
 				'token' => $query->createNamedParameter($token),
 				'attendee' => $query->createNamedParameter($attendee),

diff --git a/apps/dav/lib/Controller/InvitationResponseController.php b/apps/dav/lib/Controller/InvitationResponseController.php
@@ -162,7 +162,7 @@ public function processMoreOptionsResult(string $token):TemplateResponse {
 	private function getTokenInformation(string $token) {
 		$query = $this->db->getQueryBuilder();
 		$query->select('*')
-			->from('calendar_invitation_tokens')
+			->from('calendar_invitations')
 			->where($query->expr()->eq('token', $query->createNamedParameter($token)));
 		$stmt = $query->execute();
 		$row = $stmt->fetch(\PDO::FETCH_ASSOC);

diff --git a/apps/dav/lib/Migration/Version1005Date20180530124431.php b/apps/dav/lib/Migration/Version1005Date20180530124431.php
@@ -27,9 +27,6 @@
 use OCP\Migration\SimpleMigrationStep;
 use OCP\Migration\IOutput;
 
-/**
- * Auto-generated migration step: Please modify to your needs!
- */
 class Version1005Date20180530124431 extends SimpleMigrationStep {
 
 	/**
@@ -45,8 +42,8 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
 
 		$types = ['resources', 'rooms'];
 		foreach($types as $type) {
-			if (!$schema->hasTable('calendar_' . $type . '_cache')) {
-				$table = $schema->createTable('calendar_' . $type . '_cache');
+			if (!$schema->hasTable('calendar_' . $type)) {
+				$table = $schema->createTable('calendar_' . $type);
 
 				$table->addColumn('id', Type::BIGINT, [
 					'autoincrement' => true,
@@ -75,10 +72,10 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
 					'length' => 4000,
 				]);
 
-				$table->setPrimaryKey(['id'], 'calendar_' . $type . '_cache_id_idx');
-				$table->addIndex(['backend_id', 'resource_id'], 'calendar_' . $type . '_cache_backendresource_idx');
-				$table->addIndex(['email'], 'calendar_' . $type . '_cache_email_idx');
-				$table->addIndex(['displayname'], 'calendar_' . $type . '_cache_displayname_idx');
+				$table->setPrimaryKey(['id']);
+				$table->addIndex(['backend_id', 'resource_id'], 'calendar_' . $type . '_bkdrsc');
+				$table->addIndex(['email'], 'calendar_' . $type . '_email');
+				$table->addIndex(['displayname'], 'calendar_' . $type . '_name');
 			}
 		}
 

diff --git a/apps/dav/lib/Migration/Version1006Date20180619154313.php b/apps/dav/lib/Migration/Version1006Date20180619154313.php
@@ -22,8 +22,8 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();
 
-		if (!$schema->hasTable('calendar_invitation_tokens')) {
-			$table = $schema->createTable('calendar_invitation_tokens');
+		if (!$schema->hasTable('calendar_invitations')) {
+			$table = $schema->createTable('calendar_invitations');
 
 			$table->addColumn('id', Type::BIGINT, [
 				'autoincrement' => true,
@@ -62,8 +62,8 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
 				'unsigned' => true,
 			]);
 
-			$table->setPrimaryKey(['id'], 'calendar_invitation_tokens_id_idx');
-			$table->addIndex(['token'], 'calendar_invitation_tokens_token_idx');
+			$table->setPrimaryKey(['id']);
+			$table->addIndex(['token'], 'calendar_invitation_tokens');
 
 			return $schema;
 		}

diff --git a/apps/dav/tests/unit/BackgroundJob/CleanupInvitationTokenJobTest.php b/apps/dav/tests/unit/BackgroundJob/CleanupInvitationTokenJobTest.php
@@ -84,7 +84,7 @@ public function testRun() {
 
 		$queryBuilder->expects($this->at(0))
 			->method('delete')
-			->with('calendar_invitation_tokens')
+			->with('calendar_invitations')
 			->will($this->returnValue($queryBuilder));
 		$queryBuilder->expects($this->at(3))
 			->method('where')
@@ -97,4 +97,4 @@ public function testRun() {
 
 		$this->backgroundJob->run([]);
 	}
-}
+}
diff --git a/apps/dav/tests/unit/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJobTest.php b/apps/dav/tests/unit/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJobTest.php
@@ -60,8 +60,8 @@ protected function setUp() {
 
 	protected function tearDown() {
 		$query = self::$realDatabase->getQueryBuilder();
-		$query->delete('calendar_resources_cache')->execute();
-		$query->delete('calendar_rooms_cache')->execute();
+		$query->delete('calendar_resources')->execute();
+		$query->delete('calendar_rooms')->execute();
 	}
 
 	/**
@@ -170,7 +170,7 @@ public function testRun() {
 		$this->backgroundJob->run([]);
 
 		$query = self::$realDatabase->getQueryBuilder();
-		$query->select('*')->from('calendar_resources_cache');
+		$query->select('*')->from('calendar_resources');
 
 		$rows = [];
 		$stmt = $query->execute();
@@ -227,7 +227,7 @@ public function testRun() {
 
 	protected function createTestResourcesInCache() {
 		$query = self::$realDatabase->getQueryBuilder();
-		$query->insert('calendar_resources_cache')
+		$query->insert('calendar_resources')
 			->values([
 				'backend_id' => $query->createNamedParameter('backend1'),
 				'resource_id' => $query->createNamedParameter('res1'),
@@ -236,7 +236,7 @@ protected function createTestResourcesInCache() {
 				'group_restrictions' => $query->createNamedParameter('[]'),
 			])
 			->execute();
-		$query->insert('calendar_resources_cache')
+		$query->insert('calendar_resources')
 			->values([
 				'backend_id' => $query->createNamedParameter('backend1'),
 				'resource_id' => $query->createNamedParameter('res2'),
@@ -245,7 +245,7 @@ protected function createTestResourcesInCache() {
 				'group_restrictions' => $query->createNamedParameter('[]'),
 			])
 			->execute();
-		$query->insert('calendar_resources_cache')
+		$query->insert('calendar_resources')
 			->values([
 				'backend_id' => $query->createNamedParameter('backend2'),
 				'resource_id' => $query->createNamedParameter('res3'),
@@ -254,7 +254,7 @@ protected function createTestResourcesInCache() {
 				'group_restrictions' => $query->createNamedParameter('[]'),
 			])
 			->execute();
-		$query->insert('calendar_resources_cache')
+		$query->insert('calendar_resources')
 			->values([
 				'backend_id' => $query->createNamedParameter('backend2'),
 				'resource_id' => $query->createNamedParameter('res4'),
@@ -263,7 +263,7 @@ protected function createTestResourcesInCache() {
 				'group_restrictions' => $query->createNamedParameter('[]'),
 			])
 			->execute();
-		$query->insert('calendar_resources_cache')
+		$query->insert('calendar_resources')
 			->values([
 				'backend_id' => $query->createNamedParameter('backend3'),
 				'resource_id' => $query->createNamedParameter('res5'),
@@ -272,7 +272,7 @@ protected function createTestResourcesInCache() {
 				'group_restrictions' => $query->createNamedParameter('[]'),
 			])
 			->execute();
-		$query->insert('calendar_resources_cache')
+		$query->insert('calendar_resources')
 			->values([
 				'backend_id' => $query->createNamedParameter('backend3'),
 				'resource_id' => $query->createNamedParameter('res6'),

@@ -29,7 +29,7 @@ public function setUp() {
 
 		$this->principalBackend = new ResourcePrincipalBackend($this->dbConnection,
 			$this->userSession, $this->groupManager, $this->logger);
-		$this->expectedDbTable = 'calendar_resources_cache';
+		$this->expectedDbTable = 'calendar_resources';
 		$this->principalPrefix = 'principals/calendar-resources';
 	}
 }
@@ -29,7 +29,7 @@ public function setUp() {
 
 		$this->principalBackend = new RoomPrincipalBackend($this->dbConnection,
 			$this->userSession, $this->groupManager, $this->logger);
-		$this->expectedDbTable = 'calendar_rooms_cache';
+		$this->expectedDbTable = 'calendar_rooms';
 		$this->principalPrefix = 'principals/calendar-rooms';
 	}
 }
@@ -96,7 +96,7 @@ public function testDelivery() {
 			->will($this->returnValue($queryBuilder));
 		$queryBuilder->expects($this->at(0))
 			->method('insert')
-			->with('calendar_invitation_tokens')
+			->with('calendar_invitations')
 			->will($this->returnValue($queryBuilder));
 		$queryBuilder->expects($this->at(8))
 			->method('values')
@@ -176,7 +176,7 @@ public function testFailedDelivery() {
 			->will($this->returnValue($queryBuilder));
 		$queryBuilder->expects($this->at(0))
 			->method('insert')
-			->with('calendar_invitation_tokens')
+			->with('calendar_invitations')
 			->will($this->returnValue($queryBuilder));
 		$queryBuilder->expects($this->at(8))
 			->method('values')
@@ -264,7 +264,7 @@ public function testNoMessageSendForPastEvents($veventParams, $expectsMail) {
 				->will($this->returnValue($queryBuilder));
 			$queryBuilder->expects($this->at(0))
 				->method('insert')
-				->with('calendar_invitation_tokens')
+				->with('calendar_invitations')
 				->will($this->returnValue($queryBuilder));
 			$queryBuilder->expects($this->at(8))
 				->method('values')

diff --git a/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php b/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php
@@ -438,7 +438,7 @@ private function buildQueryExpects($token, $return, $time) {
 			->will($this->returnValue($queryBuilder));
 		$queryBuilder->expects($this->at(1))
 			->method('from')
-			->with('calendar_invitation_tokens')
+			->with('calendar_invitations')
 			->will($this->returnValue($queryBuilder));
 		$queryBuilder->expects($this->at(4))
 			->method('where')
@@ -452,4 +452,4 @@ private function buildQueryExpects($token, $return, $time) {
 		$this->timeFactory->method('getTime')
 			->will($this->returnValue($time));
 	}
-}
+}