Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/DBLayer: Add field metadata getters to query result classes

Browse Source
This commit is contained in:
Shauren
2024-07-14 14:54:51 +02:00
parent 3313ea1fe6
commit d4998bd04a
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/server/database/Database/QueryResult.cpp
View File

@@ -486,12 +486,12 @@ m_metadataResult(result)
return;
}
m_rows.resize(uint32(m_rowCount) * m_fieldCount);
m_rows.resize(std::size_t(m_rowCount) * m_fieldCount);
while (_NextRow())
{
for (uint32 fIndex = 0; fIndex < m_fieldCount; ++fIndex)
{
m_rows[uint32(m_rowPosition) * m_fieldCount + fIndex].SetMetadata(&m_fieldMetadata[fIndex]);
m_rows[std::size_t(m_rowPosition) * m_fieldCount + fIndex].SetMetadata(&m_fieldMetadata[fIndex]);
unsigned long buffer_length = m_rBind[fIndex].buffer_length;
unsigned long fetched_length = *m_rBind[fIndex].length;
@@ -518,7 +518,7 @@ m_metadataResult(result)
break;
}
m_rows[uint32(m_rowPosition) * m_fieldCount + fIndex].SetValue(
m_rows[std::size_t(m_rowPosition) * m_fieldCount + fIndex].SetValue(
(char const*)buffer,
fetched_length);
@@ -527,7 +527,7 @@ m_metadataResult(result)
}
else
{
m_rows[uint32(m_rowPosition) * m_fieldCount + fIndex].SetValue(
m_rows[std::size_t(m_rowPosition) * m_fieldCount + fIndex].SetValue(
nullptr,
*m_rBind[fIndex].length);
}
@@ -552,12 +552,10 @@ PreparedResultSet::~PreparedResultSet()
bool ResultSet::NextRow()
{
MYSQL_ROW row;
if (!_result)
return false;
row = mysql_fetch_row(_result);
MYSQL_ROW row = mysql_fetch_row(_result);
if (!row)
{
CleanUp();
@@ -629,19 +627,31 @@ void PreparedResultSet::CleanUp()
Field const& ResultSet::operator[](std::size_t index) const
{
ASSERT(index < _fieldCount);
ASSERT(index < std::size_t(_fieldCount));
return _currentRow[index];
}
QueryResultFieldMetadata const& ResultSet::GetFieldMetadata(std::size_t index) const
{
ASSERT(index < std::size_t(_fieldCount));
return _fieldMetadata[index];
}
Field* PreparedResultSet::Fetch() const
{
ASSERT(m_rowPosition < m_rowCount);
return const_cast<Field*>(&m_rows[uint32(m_rowPosition) * m_fieldCount]);
return const_cast<Field*>(&m_rows[std::size_t(m_rowPosition) * m_fieldCount]);
}
Field const& PreparedResultSet::operator[](std::size_t index) const
{
ASSERT(m_rowPosition < m_rowCount);
ASSERT(index < m_fieldCount);
return m_rows[uint32(m_rowPosition) * m_fieldCount + index];
ASSERT(index < std::size_t(m_fieldCount));
return m_rows[std::size_t(m_rowPosition) * m_fieldCount + index];
}
QueryResultFieldMetadata const& PreparedResultSet::GetFieldMetadata(std::size_t index) const
{
ASSERT(index < std::size_t(m_fieldCount));
return m_fieldMetadata[index];
}

4
src/server/database/Database/QueryResult.h
View File

@@ -35,6 +35,8 @@ class TC_DATABASE_API ResultSet
Field* Fetch() const { return _currentRow; }
Field const& operator[](std::size_t index) const;
QueryResultFieldMetadata const& GetFieldMetadata(std::size_t index) const;
protected:
std::vector<QueryResultFieldMetadata> _fieldMetadata;
uint64 _rowCount;
@@ -63,6 +65,8 @@ class TC_DATABASE_API PreparedResultSet
Field* Fetch() const;
Field const& operator[](std::size_t index) const;
QueryResultFieldMetadata const& GetFieldMetadata(std::size_t index) const;
protected:
std::vector<QueryResultFieldMetadata> m_fieldMetadata;
std::vector<Field> m_rows;