1 files changed, 11 insertions, 106 deletions

diff --git a/src/server/database/Database/QueryHolder.cpp b/src/server/database/Database/QueryHolder.cpp
index 6a8bb701a1f..7143671db75 100644
--- a/src/server/database/Database/QueryHolder.cpp
+++ b/src/server/database/Database/QueryHolder.cpp
@@ -19,26 +19,7 @@
 #include "QueryHolder.h"
 #include "PreparedStatement.h"
 #include "Log.h"
-
-bool SQLQueryHolder::SetQuery(size_t index, const char *sql)
-{
-    if (m_queries.size() <= index)
-    {
-        TC_LOG_ERROR("sql.sql", "Query index (%u) out of range (size: %u) for query: %s", uint32(index), (uint32)m_queries.size(), sql);
-        return false;
-    }
-
-    /// not executed yet, just stored (it's not called a holder for nothing)
-    SQLElementData element;
-    element.type = SQL_ELEMENT_RAW;
-    element.element.query = strdup(sql);
-
-    SQLResultSetUnion result;
-    result.qresult = NULL;
-
-    m_queries[index] = SQLResultPair(element, result);
-    return true;
-}
+#include "QueryResult.h"
 
 bool SQLQueryHolder::SetPreparedQuery(size_t index, PreparedStatement* stmt)
 {
@@ -48,59 +29,17 @@ bool SQLQueryHolder::SetPreparedQuery(size_t index, PreparedStatement* stmt)
         return false;
     }
 
-    /// not executed yet, just stored (it's not called a holder for nothing)
-    SQLElementData element;
-    element.type = SQL_ELEMENT_PREPARED;
-    element.element.stmt = stmt;
-
-    SQLResultSetUnion result;
-    result.presult = NULL;
-
-    m_queries[index] = SQLResultPair(element, result);
+    m_queries[index].first = stmt;
     return true;
 }
 
-QueryResult SQLQueryHolder::GetResult(size_t index)
-{
-    // Don't call to this function if the index is of an ad-hoc statement
-    if (index < m_queries.size())
-    {
-        ResultSet* result = m_queries[index].second.qresult;
-        if (!result || !result->GetRowCount() || !result->NextRow())
-            return QueryResult(NULL);
-
-        return QueryResult(result);
-    }
-    else
-        return QueryResult(NULL);
-}
-
 PreparedQueryResult SQLQueryHolder::GetPreparedResult(size_t index)
 {
     // Don't call to this function if the index is of a prepared statement
     if (index < m_queries.size())
-    {
-        PreparedResultSet* result = m_queries[index].second.presult;
-        if (!result || !result->GetRowCount())
-            return PreparedQueryResult(NULL);
-
-        return PreparedQueryResult(result);
-    }
+        return m_queries[index].second;
     else
-        return PreparedQueryResult(NULL);
-}
-
-void SQLQueryHolder::SetResult(size_t index, ResultSet* result)
-{
-    if (result && !result->GetRowCount())
-    {
-        delete result;
-        result = NULL;
-    }
-
-    /// store the result in the holder
-    if (index < m_queries.size())
-        m_queries[index].second.qresult = result;
+        return PreparedQueryResult(nullptr);
 }
 
 void SQLQueryHolder::SetPreparedResult(size_t index, PreparedResultSet* result)
@@ -108,12 +47,12 @@ void SQLQueryHolder::SetPreparedResult(size_t index, PreparedResultSet* result)
     if (result && !result->GetRowCount())
     {
         delete result;
-        result = NULL;
+        result = nullptr;
     }
 
     /// store the result in the holder
     if (index < m_queries.size())
-        m_queries[index].second.presult = result;
+        m_queries[index].second = PreparedQueryResult(result);
 }
 
 SQLQueryHolder::~SQLQueryHolder()
@@ -122,18 +61,7 @@ SQLQueryHolder::~SQLQueryHolder()
     {
         /// if the result was never used, free the resources
         /// results used already (getresult called) are expected to be deleted
-        if (SQLElementData* data = &m_queries[i].first)
-        {
-            switch (data->type)
-            {
-                case SQL_ELEMENT_RAW:
-                    free((void*)(const_cast<char*>(data->element.query)));
-                    break;
-                case SQL_ELEMENT_PREPARED:
-                    delete data->element.stmt;
-                    break;
-            }
-        }
+        delete m_queries[i].first;
     }
 }
 
@@ -156,33 +84,10 @@ bool SQLQueryHolderTask::Execute()
     if (!m_holder)
         return false;
 
-    /// we can do this, we are friends
-    std::vector<SQLQueryHolder::SQLResultPair> &queries = m_holder->m_queries;
-
-    for (size_t i = 0; i < queries.size(); i++)
-    {
-        /// execute all queries in the holder and pass the results
-        if (SQLElementData* data = &queries[i].first)
-        {
-            switch (data->type)
-            {
-                case SQL_ELEMENT_RAW:
-                {
-                    char const* sql = data->element.query;
-                    if (sql)
-                        m_holder->SetResult(i, m_conn->Query(sql));
-                    break;
-                }
-                case SQL_ELEMENT_PREPARED:
-                {
-                    PreparedStatement* stmt = data->element.stmt;
-                    if (stmt)
-                        m_holder->SetPreparedResult(i, m_conn->Query(stmt));
-                    break;
-                }
-            }
-        }
-    }
+    /// execute all queries in the holder and pass the results
+    for (size_t i = 0; i < m_holder->m_queries.size(); ++i)
+        if (PreparedStatement* stmt = m_holder->m_queries[i].first)
+            m_holder->SetPreparedResult(i, m_conn->Query(stmt));
 
     m_result.set_value(m_holder);
     return true;