diff options
author | Aaron Marks <nymacro@gmail.com> | 2005-06-19 12:26:04 +0000 |
---|---|---|
committer | Aaron Marks <nymacro@gmail.com> | 2005-06-19 12:26:04 +0000 |
commit | f194e2fb62234ff66d0ee12282ce4a22aa237e89 (patch) | |
tree | 60b48cf64e8b16abcee01516e7f35020b77e1171 /src/dal | |
parent | d711ab557a1e3613df1f6fd1ad818695acda05ed (diff) | |
download | manaserv-f194e2fb62234ff66d0ee12282ce4a22aa237e89.tar.gz manaserv-f194e2fb62234ff66d0ee12282ce4a22aa237e89.tar.bz2 manaserv-f194e2fb62234ff66d0ee12282ce4a22aa237e89.tar.xz manaserv-f194e2fb62234ff66d0ee12282ce4a22aa237e89.zip |
Added PostgreSQL DAL class.
Updated configure.ac to include PostgreSQL & MySQL. (MySQL needs to be adjusted, and it seems that using --with-sqlite will drop out of configure after check for atexit. I dont know why, as i didn't touch the SQLite stuff) :)
Diffstat (limited to 'src/dal')
-rw-r--r-- | src/dal/dataprovider.h | 3 | ||||
-rw-r--r-- | src/dal/dataproviderfactory.cpp | 13 | ||||
-rw-r--r-- | src/dal/pqdataprovider.cpp | 151 | ||||
-rw-r--r-- | src/dal/pqdataprovider.h | 107 |
4 files changed, 273 insertions, 1 deletions
diff --git a/src/dal/dataprovider.h b/src/dal/dataprovider.h index 4e897b3c..a3ea8cc5 100644 --- a/src/dal/dataprovider.h +++ b/src/dal/dataprovider.h @@ -42,7 +42,8 @@ namespace dal */ typedef enum { DB_BKEND_MYSQL, - DB_BKEND_SQLITE + DB_BKEND_SQLITE, + DB_BKEND_POSTGRESQL } DbBackends; diff --git a/src/dal/dataproviderfactory.cpp b/src/dal/dataproviderfactory.cpp index 7cd44e29..f0f951dd 100644 --- a/src/dal/dataproviderfactory.cpp +++ b/src/dal/dataproviderfactory.cpp @@ -26,10 +26,18 @@ #ifdef MYSQL_SUPPORT #include "mysqldataprovider.h" #else + #ifdef SQLITE_SUPPORT #include "sqlitedataprovider.h" #else + +#ifdef POSTGRE_SUPPORT +#include "pqdataprovider.h" +#else + #error "Database not specified" + +#endif #endif #endif @@ -76,6 +84,11 @@ DataProviderFactory::createDataProvider(void) return provider; #endif +#ifdef POSTGRE_SUPPORT + PqDataProvider *provider = new PqDataProvider; + return provider; +#endif + // a data provider cannot be created as the server has been compiled // without support for any database. throw std::runtime_error("missing database backend support."); diff --git a/src/dal/pqdataprovider.cpp b/src/dal/pqdataprovider.cpp new file mode 100644 index 00000000..e39665ef --- /dev/null +++ b/src/dal/pqdataprovider.cpp @@ -0,0 +1,151 @@ +/* + * The Mana World Server + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or any later version. + * + * The Mana World is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with The Mana World; if not, write to the Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id$ + */ + +#include "pqdataprovider.h" + +namespace tmwserv +{ +namespace dal +{ + +/** + * Constructor + */ +PqDataProvider::PqDataProvider(void) + throw() +{ +} + +/** + * Destructor + */ +PqDataProvider::~PqDataProvider(void) + throw() +{ + disconnect(); +} + +/** + * Get the database backend name. + */ +DbBackends +PqDataProvider::getDbBackend(void) const + throw() +{ + return DB_BKEND_POSTGRESQL; +} + +/** + * Create a connection to the database. + */ +void +PqDataProvider::connect(const std::string& dbName, + const std::string& userName, + const std::string& password) +{ + // Create string to pass to PQconnectdb + std::string connStr = "dbname = " + dbName + " "; // database name + if (userName != "") + connStr += "user = " + userName + " "; // username + if (password != "") + connStr += "password = " + password; // password + + // Connect to database + mDb = PQconnectdb(connStr.c_str()); + + if (PQstatus(mDb) != CONNECTION_OK) + { + // TODO: Postge needs to be cleaned up after throwing the exception + // PQfinish(mDb); + throw DbConnectionFailure(PQerrorMessage(mDb)); + } + + mIsConnected = true; +} + +/** + * Execute a SQL query. + */ +const RecordSet& +PqDataProvider::execSql(const std::string& sql, + const bool refresh) +{ + if (!mIsConnected) { + throw std::runtime_error("not connected to database"); + } + + if (refresh || (sql != mSql)) { + mRecordSet.clear(); + + // execute the query + PGresult *res; + + res = PQexec(mDb, sql.c_str()); + if (PQresultStatus(res) != PGRES_COMMAND_OK) { + PQclear(res); + throw DbSqlQueryExecFailure(PQerrorMessage(mDb)); + } + + // get field count + unsigned int nFields = PQnfields(res); + + // fill column names + Row fieldNames; + for (unsigned int i = 0; i < nFields; i++) { + fieldNames.push_back(PQfname(res, i)); + } + mRecordSet.setColumnHeaders(fieldNames); + + // fill rows + for (unsigned int r = 0; r < PQntuples(res); r++) { + Row row; + + for (unsigned int i = 0; i < nFields; i++) { + row.push_back(PQgetvalue(res, r, i)); + } + + mRecordSet.add(row); + } + + // clear results + PQclear(res); + } +} + +/** + * Close connection to databse. + */ +void +PqDataProvider::disconnect(void) +{ + if (!mIsConnected) { + return; + } + + // finish up with Postgre + PQfinish(mDb); + + mIsConnected = false; +} + +} // namespace dal +} // namespace tmwserv diff --git a/src/dal/pqdataprovider.h b/src/dal/pqdataprovider.h new file mode 100644 index 00000000..1e8beedc --- /dev/null +++ b/src/dal/pqdataprovider.h @@ -0,0 +1,107 @@ +/* + * The Mana World Server + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or any later version. + * + * The Mana World is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with The Mana World; if not, write to the Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id$ + */ + +#ifndef PQDATAPROVIDER_H +#define PQDATAPROVIDER_H + +#include <string> +#include "dataprovider.h" +#include "libpq-fe.h" + +namespace tmwserv +{ +namespace dal +{ + +class PqDataProvider : public DataProvider +{ + public: + /** + * Constructor + */ + PqDataProvider() + throw(); + + /** + * Destructor + */ + ~PqDataProvider() + throw(); + + /** + * Get name of the database backend + * + * @return the database backend name + */ + DbBackends + getDbBackend(void) const + throw(); + + /** + * Create a connection to the database. + * + * @param dbName the database name. + * @param userName the user name. + * @param password the user password. + * + * @exception DbConnectionFailure if unsuccessful connection. + */ + void + connect(const std::string& dbName, + const std::string& userName, + const std::string& password); + + + /** + * Execute a SQL query. + * + * @param sql the SQL query. + * @param refresh if true, refresh the cache (default = false). + * + * @return a recordset. + * + * @exception DbSqlQueryExecFailure if unsuccessful execution. + * @exception std::runtime_error if trying to query a closed database. + */ + const RecordSet& + execSql(const std::string& sql, + const bool refresh = false); + + + /** + * Close the connection to the database. + * + * @exception DbDisconnectionFailure if unsuccessful disconnection. + */ + void + disconnect(void); + + protected: + PGconn *mDb; /**< Database connection handle */ + +}; + + +} +} + +#endif |