Merge branch 'master' of https://github.com/EQEmu/Server into integration/multi-tenancy-expansions-repository

This commit is contained in:
Akkadius 2020-05-24 04:07:38 -05:00
commit 02fa823736

View File

@ -484,9 +484,6 @@ void Database::DeleteInstance(uint16 instance_id)
{ {
std::string query; std::string query;
query = StringFormat("DELETE FROM instance_list WHERE id=%u", instance_id);
QueryDatabase(query);
query = StringFormat("DELETE FROM instance_list_player WHERE id=%u", instance_id); query = StringFormat("DELETE FROM instance_list_player WHERE id=%u", instance_id);
QueryDatabase(query); QueryDatabase(query);
@ -574,6 +571,9 @@ void Database::PurgeExpiredInstances()
} }
for (auto row = results.begin(); row != results.end(); ++row) { for (auto row = results.begin(); row != results.end(); ++row) {
query = StringFormat("DELETE FROM instance_list WHERE id=%u", atoi(row[0]));
QueryDatabase(query);
DeleteInstance(atoi(row[0])); DeleteInstance(atoi(row[0]));
} }
} }