Core/DBLayer:
- Rewrite Field class to be able to store both binary prepared statement data and data from adhoc query resultsets
- Buffer the data of prepared statements using ResultSet and Field classes and let go of mysql c api structures after PreparedResultSet constructor. Fixes a race condition and thus a possible crash/data corruption (issue pointed out to Derex, basic suggestion by raczman)
- Conform PreparedResultSet and ResultSet to the same design standards, and using Field class as data buffer class for both
* NOTE: This means the fetching methods are uniform again, using ¨Field* fields = result->Fetch();¨ and access to elements trough fields[x].
* NOTE: for access to the correct row in prepared statements, ¨Field* fields = result->Fetch();¨ must ALWAYS be called inside the do { }while(result->NextRow()) loop.
* NOTE: This means that Field::GetString() returns std::string object and Field::GetCString() returns const char* pointer.
Still experimental and all that jazz, not recommended for production servers until feedback is given.
--HG--
branch : trunk
This commit is contained in:
@@ -207,7 +207,7 @@ std::string CreateDumpString(char const* tableName, QueryResult result)
|
||||
if (i == 0) ss << "'";
|
||||
else ss << ", '";
|
||||
|
||||
std::string s = fields[i].GetCppString();
|
||||
std::string s = fields[i].GetString();
|
||||
CharacterDatabase.escape_string(s);
|
||||
ss << s;
|
||||
|
||||
@@ -257,7 +257,7 @@ void StoreGUID(QueryResult result,uint32 field,std::set<uint32>& guids)
|
||||
void StoreGUID(QueryResult result,uint32 data,uint32 field, std::set<uint32>& guids)
|
||||
{
|
||||
Field* fields = result->Fetch();
|
||||
std::string dataStr = fields[data].GetCppString();
|
||||
std::string dataStr = fields[data].GetString();
|
||||
uint32 guid = atoi(gettoknth(dataStr, field).c_str());
|
||||
if (guid)
|
||||
guids.insert(guid);
|
||||
|
||||
Reference in New Issue
Block a user