From f194e2fb62234ff66d0ee12282ce4a22aa237e89 Mon Sep 17 00:00:00 2001 From: Aaron Marks Date: Sun, 19 Jun 2005 12:26:04 +0000 Subject: 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) :) --- configure.ac | 52 +++++++++++++- src/Makefile.am | 36 +++++----- src/dal/dataprovider.h | 3 +- src/dal/dataproviderfactory.cpp | 13 ++++ src/dal/pqdataprovider.cpp | 151 ++++++++++++++++++++++++++++++++++++++++ src/dal/pqdataprovider.h | 107 ++++++++++++++++++++++++++++ src/dalstoragesql.h | 4 +- 7 files changed, 342 insertions(+), 24 deletions(-) create mode 100644 src/dal/pqdataprovider.cpp create mode 100644 src/dal/pqdataprovider.h diff --git a/configure.ac b/configure.ac index 47adf476..0e9be66d 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ if test "x$with_sqlite" == "xyes"; then ) # Add define - SQLITE_CFLAGS=" -DSQLITE_SUPPORT $SQLITE_SUPPORT -DUSE_SQLITE" + SQLITE_CFLAGS=" -DSQLITE_SUPPORT -DUSER_SQLITE" AC_SUBST(SQLITE_CFLAGS) AC_SUBST(SQLITE_LIBS) @@ -25,6 +25,49 @@ fi AM_CONDITIONAL(BUILD_SQLITE, test x$with_sqlite = xyes) +# Check if with Postgre +AC_ARG_WITH(postgre,[ --with-postgre support PostgreSQL ] ) +if test "x$with_postgre" == "xyes"; then + with_postgre=yes + + # Check with pkg-config + AC_CHECK_LIB([pq], [PQconnectdb], , + AC_MSG_ERROR([Cannot find PostgreSQL])) + + # Add define + POSTGRE_CFLAGS=" -DPOSTGRE_SUPPORT" + POSTGRE_LIBS=" -lpq" + + AC_SUBST(POSTGRE_CFLAGS) + AC_SUBST(POSTGRE_LIBS) +else + with_postgre=no +fi + +AM_CONDITIONAL(BUILD_POSTGRE, test x$with_postgre = xyes) + +# Check if with Postgre +AC_ARG_WITH(mysql,[ --with-mysql support MySQL ] ) +if test "x$with_mysql" == "xyes"; then + with_mysql=yes + + # TODO: Fix this up! (the lib might not be in the LD path) + # Check with pkg-config + AC_CHECK_LIB([mysqlclient], [mysql_init], , + AC_MSG_ERROR([Cannot find MySQL])) + + # Add define + MYSQL_CFLAGS=" -DMYSQL_SUPPORT `mysql_config --libs`" + MYSQL_LIBS=" `mysql_config --libs`" + + AC_SUBST(MYSQL_CFLAGS) + AC_SUBST(MYSQL_LIBS) +else + with_mysql=no +fi + +AM_CONDITIONAL(BUILD_MYSQL, test x$with_mysql = xyes) + # Checks for programs. AC_PROG_CXX AC_PROG_CC @@ -36,7 +79,7 @@ AC_CHECK_LIB([SDL_net], [SDLNet_Init]) AC_CHECK_LIB([crypto], [EVP_Digest]) AC_CHECK_LIB([crypto], [EVP_md5]) -AC_ARG_WITH(scripting,[ --with-scripting Build with scripting]) +AC_ARG_WITH(scripting,[ --with-scripting Build with scripting]) if test "x$with_scripting" == "xyes"; then AC_CHECK_LIB([squirrel], [sq_open], , AC_MSG_ERROR([Cannot find Squirrel library (squirrel.sf.net)])) @@ -63,9 +106,14 @@ AC_CHECK_FUNCS([atexit]) AC_CONFIG_FILES([Makefile src/Makefile]) + AC_OUTPUT +AMDEP=AMDEP_TRUE + echo echo "Building with scripting support: $with_scripting" echo "Building with SQLite support: $with_sqlite" +echo "Building with PostgreSQL support: $with_postgre" +echo "Building with MySQL support: $with_mysql" echo diff --git a/src/Makefile.am b/src/Makefile.am index 71f67e5e..33e18365 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -34,8 +34,6 @@ tmwserv_SOURCES = main.cpp \ dal/dataprovider.cpp \ dal/dataproviderfactory.h \ dal/dataproviderfactory.cpp \ - dal/sqlitedataprovider.h \ - dal/sqlitedataprovider.cpp \ dal/recordset.h \ dal/recordset.cpp \ dal/dalexcept.h \ @@ -48,26 +46,24 @@ tmwserv_SOURCES = main.cpp \ utils/logger.h \ utils/logger.cpp -# dal/mysqldataprovider.h -# dal/mysqldataprovider.cpp +if BUILD_SQLITE +tmwserv_SOURCES += dal/sqlitedataprovider.h \ + dal/sqlitedataprovider.cpp +endif -# Obsoleted by utils/logger.* -# -# log.h -# log.cpp +if BUILD_POSTGRE +tmwserv_SOURCES += dal/pqdataprovider.h \ + dal/pqdataprovider.cpp +endif -# Obsoleted by DAL. -# -#if BUILD_SQLITE -#tmwserv_SOURCES += sqlite/SQLiteWrapper.cpp \ -# sqlite/SQLiteWrapper.h \ -# sqlitestorage.cpp \ -# sqlitestorage.h -#endif +if BUILD_MYSQL +tmwserv_SOURCES += dal/mysqldataprovider.h \ + dal/mysqldataprovider.cpp +endif # set the include path found by configure -INCLUDES= $(all_includes) $(SQLITE_CFLAGS) -LIBS = $(SQLITE_LIBS) +INCLUDES= $(all_includes) +LIBS = $(SQLITE_LIBS) $(MYSQL_LIBS) $(POSTGRE_LIBS) # the library search path. tmwserv_LDFLAGS = $(all_libraries) \ @@ -75,7 +71,9 @@ tmwserv_LDFLAGS = $(all_libraries) \ `pkg-config --libs libxml-2.0` \ -lphysfs \ -lcrypto -tmwserv_CXXFLAGS = -g -Wall `sdl-config --cflags` `pkg-config --cflags libxml-2.0` -fno-inline $(SCRIPT_CFLAGS) +tmwserv_CXXFLAGS = -g -Wall `sdl-config --cflags` `pkg-config --cflags libxml-2.0` -fno-inline $(SCRIPT_CFLAGS) $(POSTGRE_CFLAGS) $(SQLITE_CFLAGS) + #tmwserv_LDADD = $(LIBSDL_LIBS) -lphysfs tmwserv_LDADD = $(SCRIPT_LIBS) tmwserv_TARGET = ../tmwserv + 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 +#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 diff --git a/src/dalstoragesql.h b/src/dalstoragesql.h index 3de9b33f..1e24f09e 100644 --- a/src/dalstoragesql.h +++ b/src/dalstoragesql.h @@ -25,8 +25,8 @@ #define _TMWSERV_DALSTORAGE_SQL_H_ -#if !defined (MYSQL_SUPPORT) && !defined (SQLITE_SUPPORT) -#error "no database backend defined" +#if !defined (MYSQL_SUPPORT) && !defined (SQLITE_SUPPORT) && !defined (POSTGRE_SUPPORT) +#error "(dalstorage.h) no database backend defined" #endif -- cgit v1.2.3-70-g09d2