diff options
author | Naios <naios-dev@live.de> | 2015-03-22 01:28:50 +0100 |
---|---|---|
committer | Naios <naios-dev@live.de> | 2015-03-22 01:28:50 +0100 |
commit | 8e48ef7863c5018aa185913ce6a616e46ef5b17e (patch) | |
tree | 91ce5294560649151a5a90ddf13e8901a8a89379 | |
parent | 3799d454b36ef55148280311e8f096e877d12be8 (diff) |
Core/DBUpdater: Use correct uint64 to store timestamps.
* Thanks @Shauren for pointing out.
* Also removes an invalid argument thanks @jackpoz for noticing.
-rw-r--r-- | src/server/shared/Updater/DBUpdater.cpp | 2 | ||||
-rw-r--r-- | src/server/shared/Updater/UpdateFetcher.cpp | 4 | ||||
-rw-r--r-- | src/server/shared/Updater/UpdateFetcher.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/server/shared/Updater/DBUpdater.cpp b/src/server/shared/Updater/DBUpdater.cpp index 156c2a8fdd4..859c697168a 100644 --- a/src/server/shared/Updater/DBUpdater.cpp +++ b/src/server/shared/Updater/DBUpdater.cpp @@ -315,7 +315,7 @@ bool DBUpdater<T>::Populate(DatabaseWorkerPool<T>& pool) case LOCATION_REPOSITORY: { TC_LOG_ERROR("sql.updates", ">> Base file \"%s\" is missing, try to clone the source again.", - base.generic_string().c_str(), base.filename().generic_string().c_str()); + base.generic_string().c_str()); break; } diff --git a/src/server/shared/Updater/UpdateFetcher.cpp b/src/server/shared/Updater/UpdateFetcher.cpp index 8084c6ba37f..63e820c3de5 100644 --- a/src/server/shared/Updater/UpdateFetcher.cpp +++ b/src/server/shared/Updater/UpdateFetcher.cpp @@ -119,7 +119,7 @@ UpdateFetcher::AppliedFileStorage UpdateFetcher::ReceiveAppliedFiles() const { AppliedFileStorage map; - QueryResult result = _retrieve("SELECT `name`, `hash`, `state`, `timestamp` FROM `updates` ORDER BY `name` ASC"); + QueryResult result = _retrieve("SELECT `name`, `hash`, `state`, UNIX_TIMESTAMP(`timestamp`) FROM `updates` ORDER BY `name` ASC"); if (!result) return map; @@ -128,7 +128,7 @@ UpdateFetcher::AppliedFileStorage UpdateFetcher::ReceiveAppliedFiles() const Field* fields = result->Fetch(); AppliedFileEntry const entry = { fields[0].GetString(), fields[1].GetString(), - AppliedFileEntry::StateConvert(fields[2].GetString()), fields[3].GetUInt32() }; + AppliedFileEntry::StateConvert(fields[2].GetString()), fields[3].GetUInt64() }; map.insert(std::make_pair(entry.name, entry)); } diff --git a/src/server/shared/Updater/UpdateFetcher.h b/src/server/shared/Updater/UpdateFetcher.h index c11cfbf7c82..f545c232a94 100644 --- a/src/server/shared/Updater/UpdateFetcher.h +++ b/src/server/shared/Updater/UpdateFetcher.h @@ -59,7 +59,7 @@ private: State const state; - uint32 const timestamp; + uint64 const timestamp; static inline State StateConvert(std::string const& state) { |