From 455eee9392ac5fd170bae7a1c1e1229e0881ba07 Mon Sep 17 00:00:00 2001
From: Naios <naios-dev@live.de>
Date: Sat, 4 Apr 2015 23:59:28 +0200
Subject: Core/DBUpdater: Exit clean if a query failed to apply. * Fix some \W4
 warnings about constructors.

(cherry picked from commit de490674ff1205d908301b94f5644247562b43cb)
---
 src/server/shared/Updater/DBUpdater.cpp   | 27 +++++++++++++++++++++------
 src/server/shared/Updater/UpdateFetcher.h |  6 ++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/server/shared/Updater/DBUpdater.cpp b/src/server/shared/Updater/DBUpdater.cpp
index 10119e08deb..73873c59775 100644
--- a/src/server/shared/Updater/DBUpdater.cpp
+++ b/src/server/shared/Updater/DBUpdater.cpp
@@ -272,11 +272,19 @@ bool DBUpdater<T>::Update(DatabaseWorkerPool<T>& pool)
         [&](Path const& file) { DBUpdater<T>::ApplyFile(pool, file); },
             [&](std::string const& query) -> QueryResult { return DBUpdater<T>::Retrieve(pool, query); });
 
-    uint32 const count = updateFetcher.Update(
-        sConfigMgr->GetBoolDefault("Updates.Redundancy", true),
-        sConfigMgr->GetBoolDefault("Updates.AllowRehash", true),
-        sConfigMgr->GetBoolDefault("Updates.ArchivedRedundancy", false),
-        sConfigMgr->GetIntDefault("Updates.CleanDeadRefMaxCount", 3));
+    uint32 count;
+    try
+    {
+        count = updateFetcher.Update(
+            sConfigMgr->GetBoolDefault("Updates.Redundancy", true),
+            sConfigMgr->GetBoolDefault("Updates.AllowRehash", true),
+            sConfigMgr->GetBoolDefault("Updates.ArchivedRedundancy", false),
+            sConfigMgr->GetIntDefault("Updates.CleanDeadRefMaxCount", 3));
+    }
+    catch (UpdateException&)
+    {
+        return false;
+    }
 
     if (!count)
         TC_LOG_INFO("sql.updates", ">> %s database is up-to-date!", DBUpdater<T>::GetTableName().c_str());
@@ -331,7 +339,14 @@ bool DBUpdater<T>::Populate(DatabaseWorkerPool<T>& pool)
 
     // Update database
     TC_LOG_INFO("sql.updates", ">> Applying \'%s\'...", base.generic_string().c_str());
-    ApplyFile(pool, base);
+    try
+    {
+        ApplyFile(pool, base);
+    }
+    catch (UpdateException&)
+    {
+        return false;
+    }
 
     TC_LOG_INFO("sql.updates", ">> Done!");
     return true;
diff --git a/src/server/shared/Updater/UpdateFetcher.h b/src/server/shared/Updater/UpdateFetcher.h
index fa142547873..e9eacff1547 100644
--- a/src/server/shared/Updater/UpdateFetcher.h
+++ b/src/server/shared/Updater/UpdateFetcher.h
@@ -64,6 +64,9 @@ private:
 
         uint64 const timestamp;
 
+        AppliedFileEntry(std::string const& _name, std::string const& _hash, State const _state, uint64 const _timestamp) :
+            name(_name), hash(_hash), state(_state), timestamp(_timestamp) { }
+
         static inline State StateConvert(std::string const& state)
         {
             return (state == "RELEASED") ? RELEASED : ARCHIVED;
@@ -87,6 +90,9 @@ private:
         Path const path;
 
         State const state;
+
+        DirectoryEntry(Path const& _path, State const _state) :
+            path(_path), state(_state) { }
     };
 
     typedef std::pair<Path, State> LocaleFileEntry;
-- 
cgit v1.2.3