mirror of
https://github.com/luanti-org/luanti.git
synced 2025-06-27 16:36:03 +00:00
Player data to Database (#5475)
* Player data to Database Add player data into databases (SQLite3 & PG only) PostgreSQL & SQLite: better POO Design for databases Add --migrate-players argument to server + deprecation warning * Remove players directory if empty
This commit is contained in:
parent
dda171d292
commit
29ab20c272
31 changed files with 1555 additions and 378 deletions
|
@ -27,55 +27,35 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
|
||||
class Settings;
|
||||
|
||||
class Database_PostgreSQL : public Database
|
||||
class Database_PostgreSQL: public Database
|
||||
{
|
||||
public:
|
||||
Database_PostgreSQL(const Settings &conf);
|
||||
Database_PostgreSQL(const std::string &connect_string);
|
||||
~Database_PostgreSQL();
|
||||
|
||||
void beginSave();
|
||||
void endSave();
|
||||
|
||||
bool saveBlock(const v3s16 &pos, const std::string &data);
|
||||
void loadBlock(const v3s16 &pos, std::string *block);
|
||||
bool deleteBlock(const v3s16 &pos);
|
||||
void listAllLoadableBlocks(std::vector<v3s16> &dst);
|
||||
bool initialized() const;
|
||||
|
||||
private:
|
||||
// Database initialization
|
||||
void connectToDatabase();
|
||||
void initStatements();
|
||||
void createDatabase();
|
||||
|
||||
inline void prepareStatement(const std::string &name, const std::string &sql)
|
||||
{
|
||||
checkResults(PQprepare(m_conn, name.c_str(), sql.c_str(), 0, NULL));
|
||||
}
|
||||
|
||||
// Database connectivity checks
|
||||
void ping();
|
||||
void verifyDatabase();
|
||||
|
||||
// Database usage
|
||||
PGresult *checkResults(PGresult *res, bool clear = true);
|
||||
|
||||
inline PGresult *execPrepared(const char *stmtName, const int paramsNumber,
|
||||
const void **params,
|
||||
const int *paramsLengths = NULL, const int *paramsFormats = NULL,
|
||||
bool clear = true, bool nobinary = true)
|
||||
{
|
||||
return checkResults(PQexecPrepared(m_conn, stmtName, paramsNumber,
|
||||
(const char* const*) params, paramsLengths, paramsFormats,
|
||||
nobinary ? 1 : 0), clear);
|
||||
}
|
||||
|
||||
protected:
|
||||
// Conversion helpers
|
||||
inline int pg_to_int(PGresult *res, int row, int col)
|
||||
{
|
||||
return atoi(PQgetvalue(res, row, col));
|
||||
}
|
||||
|
||||
inline u32 pg_to_uint(PGresult *res, int row, int col)
|
||||
{
|
||||
return (u32) atoi(PQgetvalue(res, row, col));
|
||||
}
|
||||
|
||||
inline float pg_to_float(PGresult *res, int row, int col)
|
||||
{
|
||||
return (float) atof(PQgetvalue(res, row, col));
|
||||
}
|
||||
|
||||
inline v3s16 pg_to_v3s16(PGresult *res, int row, int col)
|
||||
{
|
||||
return v3s16(
|
||||
|
@ -85,11 +65,86 @@ private:
|
|||
);
|
||||
}
|
||||
|
||||
inline PGresult *execPrepared(const char *stmtName, const int paramsNumber,
|
||||
const void **params,
|
||||
const int *paramsLengths = NULL, const int *paramsFormats = NULL,
|
||||
bool clear = true, bool nobinary = true)
|
||||
{
|
||||
return checkResults(PQexecPrepared(m_conn, stmtName, paramsNumber,
|
||||
(const char* const*) params, paramsLengths, paramsFormats,
|
||||
nobinary ? 1 : 0), clear);
|
||||
}
|
||||
|
||||
inline PGresult *execPrepared(const char *stmtName, const int paramsNumber,
|
||||
const char **params, bool clear = true, bool nobinary = true)
|
||||
{
|
||||
return execPrepared(stmtName, paramsNumber,
|
||||
(const void **)params, NULL, NULL, clear, nobinary);
|
||||
}
|
||||
|
||||
void createTableIfNotExists(const std::string &table_name, const std::string &definition);
|
||||
void verifyDatabase();
|
||||
|
||||
// Database initialization
|
||||
void connectToDatabase();
|
||||
virtual void createDatabase() = 0;
|
||||
virtual void initStatements() = 0;
|
||||
inline void prepareStatement(const std::string &name, const std::string &sql)
|
||||
{
|
||||
checkResults(PQprepare(m_conn, name.c_str(), sql.c_str(), 0, NULL));
|
||||
}
|
||||
|
||||
const int getPGVersion() const { return m_pgversion; }
|
||||
private:
|
||||
// Database connectivity checks
|
||||
void ping();
|
||||
|
||||
// Database usage
|
||||
PGresult *checkResults(PGresult *res, bool clear = true);
|
||||
|
||||
// Attributes
|
||||
std::string m_connect_string;
|
||||
PGconn *m_conn;
|
||||
int m_pgversion;
|
||||
};
|
||||
|
||||
class MapDatabasePostgreSQL : private Database_PostgreSQL, public MapDatabase
|
||||
{
|
||||
public:
|
||||
MapDatabasePostgreSQL(const std::string &connect_string);
|
||||
virtual ~MapDatabasePostgreSQL() {}
|
||||
|
||||
bool saveBlock(const v3s16 &pos, const std::string &data);
|
||||
void loadBlock(const v3s16 &pos, std::string *block);
|
||||
bool deleteBlock(const v3s16 &pos);
|
||||
void listAllLoadableBlocks(std::vector<v3s16> &dst);
|
||||
|
||||
void beginSave() { Database_PostgreSQL::beginSave(); }
|
||||
void endSave() { Database_PostgreSQL::endSave(); }
|
||||
|
||||
protected:
|
||||
virtual void createDatabase();
|
||||
virtual void initStatements();
|
||||
};
|
||||
|
||||
class PlayerDatabasePostgreSQL : private Database_PostgreSQL, public PlayerDatabase
|
||||
{
|
||||
public:
|
||||
PlayerDatabasePostgreSQL(const std::string &connect_string);
|
||||
virtual ~PlayerDatabasePostgreSQL() {}
|
||||
|
||||
void savePlayer(RemotePlayer *player);
|
||||
bool loadPlayer(RemotePlayer *player, PlayerSAO *sao);
|
||||
bool removePlayer(const std::string &name);
|
||||
void listPlayers(std::vector<std::string> &res);
|
||||
|
||||
protected:
|
||||
virtual void createDatabase();
|
||||
virtual void initStatements();
|
||||
|
||||
private:
|
||||
bool playerDataExists(const std::string &playername);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue