edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add override in mysql code too (fixes #5139)

Browse source
This commit is contained in:
Dennis Felsing 2022-05-19 10:35:24 +02:00
parent 609987730c
commit d1eba47cf8
1 changed files with 31 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/engine/server/databases/mysql.cpp
View file

@ -65,44 +65,44 @@ public:
const char *pIp, const char *pIp,
int Port, int Port,
bool Setup); bool Setup);
virtual ~CMysqlConnection(); ~CMysqlConnection();
virtual void Print(IConsole *pConsole, const char *Mode); void Print(IConsole *pConsole, const char *Mode) override;
virtual CMysqlConnection *Copy(); CMysqlConnection *Copy() override;
virtual const char *BinaryCollate() const { return "utf8mb4_bin"; } const char *BinaryCollate() const override { return "utf8mb4_bin"; }
virtual void ToUnixTimestamp(const char *pTimestamp, char *aBuf, unsigned int BufferSize); void ToUnixTimestamp(const char *pTimestamp, char *aBuf, unsigned int BufferSize) override;
virtual const char *InsertTimestampAsUtc() const { return "?"; } const char *InsertTimestampAsUtc() const override { return "?"; }
virtual const char *CollateNocase() const { return "CONVERT(? USING utf8mb4) COLLATE utf8mb4_general_ci"; } const char *CollateNocase() const override { return "CONVERT(? USING utf8mb4) COLLATE utf8mb4_general_ci"; }
virtual const char *InsertIgnore() const { return "INSERT IGNORE"; } const char *InsertIgnore() const override { return "INSERT IGNORE"; }
virtual const char *Random() const { return "RAND()"; } const char *Random() const override { return "RAND()"; }
virtual const char *MedianMapTime(char *pBuffer, int BufferSize) const; const char *MedianMapTime(char *pBuffer, int BufferSize) const override;
virtual const char *False() const { return "FALSE"; } const char *False() const override { return "FALSE"; }
virtual const char *True() const { return "TRUE"; } const char *True() const override { return "TRUE"; }
virtual bool Connect(char *pError, int ErrorSize); bool Connect(char *pError, int ErrorSize) override;
virtual void Disconnect(); void Disconnect() override;
virtual bool PrepareStatement(const char *pStmt, char *pError, int ErrorSize); bool PrepareStatement(const char *pStmt, char *pError, int ErrorSize) override;
virtual void BindString(int Idx, const char *pString); void BindString(int Idx, const char *pString) override;
virtual void BindBlob(int Idx, unsigned char *pBlob, int Size); void BindBlob(int Idx, unsigned char *pBlob, int Size) override;
virtual void BindInt(int Idx, int Value); void BindInt(int Idx, int Value) override;
virtual void BindInt64(int Idx, int64_t Value); void BindInt64(int Idx, int64_t Value) override;
virtual void BindFloat(int Idx, float Value); void BindFloat(int Idx, float Value) override;
virtual void Print() {} void Print() override {}
virtual bool Step(bool *pEnd, char *pError, int ErrorSize); bool Step(bool *pEnd, char *pError, int ErrorSize) override;
virtual bool ExecuteUpdate(int *pNumUpdated, char *pError, int ErrorSize); bool ExecuteUpdate(int *pNumUpdated, char *pError, int ErrorSize) override;
virtual bool IsNull(int Col); bool IsNull(int Col) override;
virtual float GetFloat(int Col); float GetFloat(int Col) override;
virtual int GetInt(int Col); int GetInt(int Col) override;
virtual int64_t GetInt64(int Col); int64_t GetInt64(int Col) override;
virtual void GetString(int Col, char *pBuffer, int BufferSize); void GetString(int Col, char *pBuffer, int BufferSize) override;
virtual int GetBlob(int Col, unsigned char *pBuffer, int BufferSize); int GetBlob(int Col, unsigned char *pBuffer, int BufferSize) override;
virtual bool AddPoints(const char *pPlayer, int Points, char *pError, int ErrorSize); bool AddPoints(const char *pPlayer, int Points, char *pError, int ErrorSize) override;
private: private:
class CStmtDeleter class CStmtDeleter
@ -701,11 +701,7 @@ bool CMysqlConnection::AddPoints(const char *pPlayer, int Points, char *pError,
BindInt(2, Points); BindInt(2, Points);
BindInt(3, Points); BindInt(3, Points);
int NumUpdated; int NumUpdated;
if(ExecuteUpdate(&NumUpdated, pError, ErrorSize)) return ExecuteUpdate(&NumUpdated, pError, ErrorSize);
{
return true;
}
return false;
} }
std::unique_ptr<IDbConnection> CreateMysqlConnection( std::unique_ptr<IDbConnection> CreateMysqlConnection(