edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate teamranks (fixes #2405)

Browse source 
by ordering names in binary collation, consistent with C++ std::sort

Required since the official DDNet DB uses utf8mb4_general_ci default collation
This commit is contained in:
def 2020-09-07 06:52:54 +02:00
parent f1145fb7e0
commit a2b5d639a0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/server/score.cpp
View file

@ -582,8 +582,8 @@ bool CScore::SaveTeamScoreThread(IDbConnection *pSqlServer, const ISqlData *pGam
"FROM %s_teamrace " "FROM %s_teamrace "
"WHERE Map = ? AND Name = ? AND DDNet7 = false" "WHERE Map = ? AND Name = ? AND DDNet7 = false"
") as l INNER JOIN %s_teamrace AS r ON l.ID = r.ID " ") as l INNER JOIN %s_teamrace AS r ON l.ID = r.ID "
"ORDER BY l.ID, Name COLLATE utf8mb4_bin;", "ORDER BY l.ID, Name COLLATE %s;",
pSqlServer->GetPrefix(), pSqlServer->GetPrefix()); pSqlServer->GetPrefix(), pSqlServer->GetPrefix(), pSqlServer->BinaryCollate());
pSqlServer->PrepareStatement(aBuf); pSqlServer->PrepareStatement(aBuf);
pSqlServer->BindString(1, pData->m_Map); pSqlServer->BindString(1, pData->m_Map);
pSqlServer->BindString(2, pData->m_aNames[0]); pSqlServer->BindString(2, pData->m_aNames[0]);