mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 19:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[7935] Move seldom used access to query data by field names to independent object.

Browse source 
This let not do preparation code for unused later functionlity.
This commit is contained in:
VladimirMangos 2009-06-01 10:20:28 +04:00
parent 626553c9ee
commit c3c7187841
12 changed files with 165 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

65
src/shared/Database/DatabasePostgre.cpp
View file

@ -115,32 +115,27 @@ bool DatabasePostgre::Initialize(const char *infoString)
}
QueryResult* DatabasePostgre::Query(const char *sql)
bool DatabasePostgre::_Query(const char *sql, PGresult** pResult, uint64* pRowCount, uint32* pFieldCount)
{
if (!mPGconn)
return 0;
uint64 rowCount = 0;
uint32 fieldCount = 0;
// guarded block for thread-safe request
ACE_Guard<ACE_Thread_Mutex> query_connection_guard(mMutex);
#ifdef MANGOS_DEBUG
uint32 _s = getMSTime();
#endif
// Send the query
PGresult * result = PQexec(mPGconn, sql);
if (!result )
{
return NULL;
}
*pResult = PQexec(mPGconn, sql);
if(!*pResult )
return false;
if (PQresultStatus(result) != PGRES_TUPLES_OK)
if (PQresultStatus(*pResult) != PGRES_TUPLES_OK)
{
sLog.outErrorDb( "SQL : %s", sql );
sLog.outErrorDb( "SQL %s", PQerrorMessage(mPGconn));
PQclear(result);
return NULL;
PQclear(*pResult);
return false;
}
else
{
@ -149,15 +144,29 @@ QueryResult* DatabasePostgre::Query(const char *sql)
#endif
}
rowCount = PQntuples(result);
fieldCount = PQnfields(result);
*pRowCount = PQntuples(*pResult);
*pFieldCount = PQnfields(*pResult);
// end guarded block
if (!rowCount)
if (!*pRowCount)
{
PQclear(result);
return NULL;
PQclear(*pResult);
return false;
}
return true;
}
QueryResult* DatabasePostgre::Query(const char *sql)
{
if (!mPGconn)
return 0;
PGresult* result = NULL;
uint64 rowCount = 0;
uint32 fieldCount = 0;
if(!_Query(sql,&result,&rowCount,&fieldCount))
return NULL;
QueryResultPostgre * queryResult = new QueryResultPostgre(result, rowCount, fieldCount);
queryResult->NextRow();
@ -165,6 +174,28 @@ QueryResult* DatabasePostgre::Query(const char *sql)
return queryResult;
}
QueryNamedResult* DatabasePostgre::QueryNamed(const char *sql)
{
if (!mPGconn)
return 0;
PGresult* result = NULL;
uint64 rowCount = 0;
uint32 fieldCount = 0;
if(!_Query(sql,&result,&rowCount,&fieldCount))
return NULL;
QueryFieldNames names(fieldCount);
for (uint32 i = 0; i < fieldCount; i++)
names[i] = PQfname(result, i);
QueryResultPostgre * queryResult = new QueryResultPostgre(result, rowCount, fieldCount);
queryResult->NextRow();
return new QueryNamedResult(queryResult,names);
}
bool DatabasePostgre::Execute(const char *sql)
{