Fix Lint broken by b662a4577d692329b9ca83525e6039f2ddcd1ac1

[oweals/minetest.git] / src / database-postgresql.h

diff --git a/src/database-postgresql.h b/src/database-postgresql.h
index 1cfa544e33a8c90ece2f5cb0fc2ca5ba88b0548b..d6f208fd942695cb678215b926e87cac55f3736c 100644 (file)
--- a/src/database-postgresql.h
+++ b/src/database-postgresql.h
@@ -27,53 +27,33 @@ 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)
+protected:
+       // Conversion helpers
+       inline int pg_to_int(PGresult *res, int row, int col)
        {
-               checkResults(PQprepare(m_conn, name.c_str(), sql.c_str(), 0, NULL));
+               return atoi(PQgetvalue(res, row, col));
        }
 
-       // 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)
+       inline u32 pg_to_uint(PGresult *res, int row, int col)
        {
-               return checkResults(PQexecPrepared(m_conn, stmtName, paramsNumber,
-                       (const char* const*) params, paramsLengths, paramsFormats,
-                       nobinary ? 1 : 0), clear);
+               return (u32) atoi(PQgetvalue(res, row, col));
        }
 
-       // Conversion helpers
-       inline int pg_to_int(PGresult *res, int row, int col)
+       inline float pg_to_float(PGresult *res, int row, int col)
        {
-               return atoi(PQgetvalue(res, row, col));
+               return (float) atof(PQgetvalue(res, row, col));
        }
 
        inline v3s16 pg_to_v3s16(PGresult *res, int row, int col)
@@ -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