Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-15 15:41:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

pass rather than hard-coding column name

Browse source
This commit is contained in:
Eric House 2013-06-17 06:48:22 -07:00
parent 5da4936e43
commit 7ce939f5c0
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
xwords4/relay/dbmgr.cpp
View file

@ -384,7 +384,7 @@ DBMgr::AddDevice( const char* connName, HostID curID, int clientVersion,
if ( newID == HOST_ID_NONE ) {
int arr[4] = {0};
readArray( connName, arr );
readArray( connName, "nPerDevice", arr );
for ( newID = HOST_ID_SERVER; newID <= 4; ++newID ) {
if ( arr[newID-1] == 0 ) {
break;
@ -709,12 +709,12 @@ DBMgr::execSql( const char* const query )
}
void
DBMgr::readArray( const char* const connName, int arr[] ) /* len 4 */
DBMgr::readArray( const char* const connName, const char* column, int arr[] ) /* len 4 */
{
const char* fmt = "SELECT nPerDevice FROM " GAMES_TABLE " WHERE connName='%s'";
const char* fmt = "SELECT %s FROM " GAMES_TABLE " WHERE connName='%s'";
string query;
string_printf( query, fmt, connName );
string_printf( query, fmt, column, connName );
logf( XW_LOGINFO, "%s: query: %s", __func__, query.c_str() );
PGresult* result = PQexec( getThreadConn(), query.c_str() );
@ -768,7 +768,7 @@ DBMgr::getDevID( const DevID* devID )
}
PQclear( result );
}
logf( XW_LOGINFO, "%s(in=%s)=>%d (0x.8X)", __func__,
logf( XW_LOGINFO, "%s(in=%s)=>%d (0x%.8X)", __func__,
devID->m_devIDString.c_str(), rDevID, rDevID );
return rDevID;
}

2
xwords4/relay/dbmgr.h
View file

@ -121,7 +121,7 @@ class DBMgr {
DBMgr();
bool execSql( const string& query );
bool execSql( const char* const query ); /* no-results query */
void readArray( const char* const connName, int arr[] );
void readArray( const char* const connName, const char* column, int arr[] );
DevIDRelay getDevID( const char* connName, int hid );
DevIDRelay getDevID( const DevID* devID );
int getCountWhere( const char* table, string& test );