Core/Database: Added very simple macro to create named query result field accessors

3 files changed, 68 insertions, 0 deletions

diff --git a/src/server/database/Database/QueryResult.cpp b/src/server/database/Database/QueryResult.cpp
index 0c35ac6688d..99f81ae7ec6 100644
--- a/src/server/database/Database/QueryResult.cpp
+++ b/src/server/database/Database/QueryResult.cpp
@@ -652,6 +652,13 @@ QueryResultFieldMetadata const& ResultSet::GetFieldMetadata(std::size_t index) c
     return _fieldMetadata[index];
 }
 
+QueryResultFieldMetadata const& ResultSet::GetFieldMetadata(Trinity::DB::FieldLookupByAliasKey const& alias) const
+{
+    auto itr = _fieldIndexByAlias.find(alias);
+    ASSERT(itr != _fieldIndexByAlias.end());
+    return _fieldMetadata[itr->second];
+}
+
 Field* PreparedResultSet::Fetch() const
 {
     ASSERT(m_rowPosition < m_rowCount);
@@ -678,3 +685,10 @@ QueryResultFieldMetadata const& PreparedResultSet::GetFieldMetadata(std::size_t
     ASSERT(index < std::size_t(m_fieldCount));
     return m_fieldMetadata[index];
 }
+
+QueryResultFieldMetadata const& PreparedResultSet::GetFieldMetadata(Trinity::DB::FieldLookupByAliasKey const& alias) const
+{
+    auto itr = m_fieldIndexByAlias.find(alias);
+    ASSERT(itr != m_fieldIndexByAlias.end());
+    return m_fieldMetadata[itr->second];
+}
diff --git a/src/server/database/Database/QueryResult.h b/src/server/database/Database/QueryResult.h
index 683f1eeab3c..2e80574b29d 100644
--- a/src/server/database/Database/QueryResult.h
+++ b/src/server/database/Database/QueryResult.h
@@ -61,6 +61,7 @@ class TC_DATABASE_API ResultSet
         Field const& operator[](Trinity::DB::FieldLookupByAliasKey const& alias) const;
 
         QueryResultFieldMetadata const& GetFieldMetadata(std::size_t index) const;
+        QueryResultFieldMetadata const& GetFieldMetadata(Trinity::DB::FieldLookupByAliasKey const& alias) const;
 
     protected:
         std::vector<QueryResultFieldMetadata> _fieldMetadata;
@@ -93,6 +94,7 @@ class TC_DATABASE_API PreparedResultSet
         Field const& operator[](Trinity::DB::FieldLookupByAliasKey const& alias) const;
 
         QueryResultFieldMetadata const& GetFieldMetadata(std::size_t index) const;
+        QueryResultFieldMetadata const& GetFieldMetadata(Trinity::DB::FieldLookupByAliasKey const& alias) const;
 
     protected:
         std::vector<QueryResultFieldMetadata> m_fieldMetadata;
diff --git a/src/server/database/Database/QueryResultStructured.h b/src/server/database/Database/QueryResultStructured.h
new file mode 100644
index 00000000000..9bb977ca540
--- /dev/null
+++ b/src/server/database/Database/QueryResultStructured.h
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TRINITYCORE_QUERY_RESULT_STRUCTURED_H
+#define TRINITYCORE_QUERY_RESULT_STRUCTURED_H
+
+#include <boost/preprocessor/cat.hpp>
+#include <boost/preprocessor/comma_if.hpp>
+#include <boost/preprocessor/seq/enum.hpp>
+#include <boost/preprocessor/seq/for_each.hpp>
+#include <boost/preprocessor/seq/for_each_i.hpp>
+#include <boost/preprocessor/stringize.hpp>
+
+#define DEFINE_FIELD_ACCESSOR_CACHE_FIELD_INDEX_INIT(r, data, i, field) BOOST_PP_COMMA_IF(i) field(result.GetFieldMetadata(BOOST_PP_STRINGIZE(field)).Index)
+
+#define DEFINE_FIELD_ACCESSOR_CACHE_FIELD(r, data, field) Field const& field() const\
+    {\
+        return Result.Fetch()[indexes.field];\
+    }
+
+#define DEFINE_FIELD_ACCESSOR_CACHE(struct_name, result_type, fields_list) \
+    struct struct_name \
+    { \
+        struct Indexes\
+        {\
+            Indexes(result_type const& result) :\
+            BOOST_PP_SEQ_FOR_EACH_I(DEFINE_FIELD_ACCESSOR_CACHE_FIELD_INDEX_INIT, ~, fields_list) { }\
+            std::size_t BOOST_PP_SEQ_ENUM(fields_list);\
+        };\
+        BOOST_PP_SEQ_FOR_EACH(DEFINE_FIELD_ACCESSOR_CACHE_FIELD, ~, fields_list) \
+        result_type const& Result; \
+        static Indexes const& indexes_impl(result_type const& result) { static Indexes const instance(result); return instance; }\
+        Indexes const& indexes = indexes_impl(Result);\
+    }
+
+#define DEFINE_FIELD_ACCESSOR_CACHE_ANONYMOUS(fields_list) DEFINE_FIELD_ACCESSOR_CACHE(BOOST_PP_CAT(FieldAccessors, __LINE__), fields_list)
+
+#endif // TRINITYCORE_QUERY_RESULT_STRUCTURED_H