StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Modify how deletion service works (actually fixes #2085); cover changes with test

Browse source
This commit is contained in:
Dane Everitt 2020-10-08 21:08:55 -07:00
parent 7a643beee0
commit 2560163655
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
8 changed files with 205 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/Services/Databases/DatabaseManagementService.php
View file

@ -151,20 +151,19 @@ class DatabaseManagementService
/**
* Delete a database from the given host server.
*
* @param int $id
* @param \Pterodactyl\Models\Database $database
* @return bool|null
*
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
* @throws \Exception
*/
public function delete($id)
public function delete(Database $database)
{
$database = $this->repository->find($id);
$this->dynamic->set('dynamic', $database->database_host_id);
$this->repository->dropDatabase($database->database);
$this->repository->dropUser($database->username, $database->remote);
$this->repository->flush();
return $this->repository->delete($id);
return $database->delete();
}
}