diff options
7 files changed, 14 insertions, 14 deletions
diff --git a/apps/dav/lib/BackgroundJob/CleanupInvitationTokenJob.php b/apps/dav/lib/BackgroundJob/CleanupInvitationTokenJob.php index e855b57ee9f..942f8e23ecb 100644 --- a/apps/dav/lib/BackgroundJob/CleanupInvitationTokenJob.php +++ b/apps/dav/lib/BackgroundJob/CleanupInvitationTokenJob.php @@ -45,7 +45,7 @@ class CleanupInvitationTokenJob extends TimedJob { 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/CalDAV/Schedule/IMipPlugin.php b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php index 40b4ee355f3..4065c21b8a1 100644 --- a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php +++ b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php @@ -536,7 +536,7 @@ class IMipPlugin extends SabreIMipPlugin { $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 index 08298a29f0f..e3bdab90aaf 100644 --- a/apps/dav/lib/Controller/InvitationResponseController.php +++ b/apps/dav/lib/Controller/InvitationResponseController.php @@ -162,7 +162,7 @@ class InvitationResponseController extends Controller { 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/Version1006Date20180619154313.php b/apps/dav/lib/Migration/Version1006Date20180619154313.php index 8fb82ffed67..91d4826c277 100644 --- a/apps/dav/lib/Migration/Version1006Date20180619154313.php +++ b/apps/dav/lib/Migration/Version1006Date20180619154313.php @@ -22,8 +22,8 @@ class Version1006Date20180619154313 extends SimpleMigrationStep { /** @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 @@ class Version1006Date20180619154313 extends SimpleMigrationStep { '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 index 3e69230f441..2d80b5bf0ea 100644 --- a/apps/dav/tests/unit/BackgroundJob/CleanupInvitationTokenJobTest.php +++ b/apps/dav/tests/unit/BackgroundJob/CleanupInvitationTokenJobTest.php @@ -84,7 +84,7 @@ class CleanupInvitationTokenJobTest extends TestCase { $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 @@ class CleanupInvitationTokenJobTest extends TestCase { $this->backgroundJob->run([]); } -}
\ No newline at end of file +} diff --git a/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php index 2fefe8dd06a..c95b32041e0 100644 --- a/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php +++ b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php @@ -96,7 +96,7 @@ class IMipPluginTest extends TestCase { ->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 @@ class IMipPluginTest extends TestCase { ->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 @@ class IMipPluginTest extends TestCase { ->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 index 333737e2262..7efb64e3dd4 100644 --- a/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php +++ b/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php @@ -438,7 +438,7 @@ EOF; ->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 @@ EOF; $this->timeFactory->method('getTime') ->will($this->returnValue($time)); } -}
\ No newline at end of file +} |