ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

fix(Core/DB): Improve module directory matching for DB updates (#25372)

Browse source
This commit is contained in:
sogladev 2026-04-05 16:14:49 +02:00 • committed by GitHub
parent c51450f52f
commit b99426b631
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/server/database/Updater/DBUpdater.cpp
View file

@ -93,7 +93,8 @@ bool DBUpdater<LoginDatabaseConnection>::IsEnabled(uint32 const updateMask)
template<>
std::string DBUpdater<LoginDatabaseConnection>::GetDBModuleName()
{
return "db-auth";
// must be lowercase
return "auth";
}
// World Database
@ -125,7 +126,8 @@ bool DBUpdater<WorldDatabaseConnection>::IsEnabled(uint32 const updateMask)
template<>
std::string DBUpdater<WorldDatabaseConnection>::GetDBModuleName()
{
return "db-world";
// must be lowercase
return "world";
}
// Character Database
@ -157,7 +159,8 @@ bool DBUpdater<CharacterDatabaseConnection>::IsEnabled(uint32 const updateMask)
template<>
std::string DBUpdater<CharacterDatabaseConnection>::GetDBModuleName()
{
return "db-characters";
// must be lowercase
return "characters";
}
// All

26
src/server/database/Updater/UpdateFetcher.cpp
View file

@ -160,18 +160,30 @@ UpdateFetcher::DirectoryStorage UpdateFetcher::ReceiveIncludedDirectories() cons
moduleList.emplace_back(itr);
// data/sql
for (auto const& itr : moduleList)
for (auto const& moduleName : moduleList)
{
std::string path = _sourceDirectory->generic_string() + "/modules/" + itr + "/data/sql/" + _dbModuleName; // modules/mod-name/data/sql/db-world
Path const p(path);
std::string path = _sourceDirectory->generic_string() + "/modules/" + moduleName + "/data/sql/"; // modules/mod-name/data/sql/
Path const p{path};
if (!is_directory(p))
continue;
DirectoryEntry const entry = { p, AppliedFileEntry::StateConvert("MODULE") };
directories.push_back(entry);
directory_iterator const end;
for (directory_iterator itr{p}; itr != end; ++itr)
{
if (!is_directory(itr->path()))
continue;
LOG_TRACE("sql.updates", "Added applied modules file \"{}\" from remote.", p.filename().generic_string());
std::filesystem::path dirPath = itr->path(); // modules/mod-name/data/sql/db-world
std::string dirName = dirPath.filename().string(); // db-world
if (dirName.find(_dbModuleName) == std::string::npos)
continue;
DirectoryEntry const entry = { dirPath, AppliedFileEntry::StateConvert("MODULE") };
directories.push_back(entry);
LOG_TRACE("sql.updates", "Added applied modules file \"{}\" from remote.", dirPath.filename().generic_string());
}
}
}