2 files changed, 40 insertions, 0 deletions
diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp
index 651ea7f41fb..bf33d96fcc0 100644
--- a/src/shared/Database/Database.cpp
+++ b/src/shared/Database/Database.cpp
@@ -192,3 +192,42 @@ bool Database::DirectPExecute(const char * format,...)
     return DirectExecute(szQuery);
 }
 
+bool Database::CheckRequiredField( char const* table_name, char const* required_name )
+{
+    // check required field
+    QueryResult* result = PQuery("SELECT %s FROM %s LIMIT 1",required_name,table_name);
+    if(result)
+    {
+        delete result;
+        return true;
+    }
+
+    // check fail, prepare readabale error message
+
+    // search current required_* field in DB
+    QueryNamedResult* result2 = PQueryNamed("SELECT * FROM %s LIMIT 1",table_name);
+    if(result2)
+    {
+        QueryFieldNames const& namesMap = result2->GetFieldNames();
+        std::string reqName;
+        for(QueryFieldNames::const_iterator itr = namesMap.begin(); itr != namesMap.end(); ++itr)
+        {
+            if(itr->substr(0,9)=="required_")
+            {
+                reqName = *itr;
+                break;
+            }
+        }
+
+        delete result;
+
+        if(!reqName.empty())
+        {
+            sLog.outErrorDb("Table `%s` have field `%s` but expected `%s`! Not all sql updates applied?",table_name,reqName.c_str(),required_name);
+            return false;
+        }
+    }
+
+    sLog.outErrorDb("Table `%s` not have required_* field but expected `%s`! Not all sql updates applied?",table_name,required_name);
+    return false;
+}
diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h
index c7390d08a1b..a11c8e9a31f 100644
--- a/src/shared/Database/Database.h
+++ b/src/shared/Database/Database.h
@@ -131,6 +131,7 @@ class TRINITY_DLL_SPEC Database
         // sets the result queue of the current thread, be careful what thread you call this from
         void SetResultQueue(SqlResultQueue * queue);
 
+        bool CheckRequiredField(char const* table_name, char const* required_name);
     private:
         bool m_logSQL;
         std::string m_logsDir;