mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-23 18:17:46 +00:00
Code Activity

Removing some unused sql functions

Browse source
This commit is contained in:
Mordred Admin 2017-08-31 11:23:14 +02:00
parent 0eeeb020eb
commit 350fc84947
5 changed files with 16 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/servers/Server_Common/Database/Database.cpp
View file

@ -116,7 +116,7 @@ bool Database::initialize( const DatabaseParams& params )
uint64_t Database::getNextUId()
{
execute( "INSERT INTO uniqueiddata( IdName ) VALUES( 'NOT_SET' );" );
execute( std::string( "INSERT INTO uniqueiddata( IdName ) VALUES( 'NOT_SET' );" ) );
auto res = query( "SELECT LAST_INSERT_ID();" );
if( !res )
@ -193,53 +193,11 @@ QueryResult * Database::fQuery( const char * QueryString, DatabaseConnection * c
return qResult;
}
void Database::fWaitExecute( const char * QueryString, DatabaseConnection * con )
{
// Send the query
_SendQuery( con, QueryString, false );
}
bool Database::execute( const char* QueryString, ... ) {
char query[16384];
va_list vlist;
va_start( vlist, QueryString );
vsnprintf( query, 16384, QueryString, vlist );
va_end( vlist );
return waitExecuteNA( query );
}
bool Database::execute( const std::string& QueryString )
{
return waitExecuteNA( QueryString.c_str() );
}
bool Database::executeNA( const char* QueryString )
{
return waitExecuteNA( QueryString );
}
//this will wait for completion
bool Database::waitExecute( const char* QueryString, ... )
{
char sql[16384];
va_list vlist;
va_start( vlist, QueryString );
vsnprintf( sql, 16384, QueryString, vlist );
va_end( vlist );
DatabaseConnection * con = getFreeConnection();
bool Result = _SendQuery( con, sql, false );
con->lock.unlock();
return Result;
}
bool Database::waitExecuteNA( const char* QueryString )
{
DatabaseConnection * con = getFreeConnection();
@ -301,7 +259,6 @@ std::string Database::escapeString( const char * esc, DatabaseConnection * con )
bool Database::_SendQuery( DatabaseConnection *con, const char* Sql, bool Self )
{
//dunno what it does ...leaving untouched
int32_t result = mysql_query( con->conn, Sql );
if( result > 0 )
{

12
src/servers/Server_REST/SapphireAPI.cpp
View file

@ -99,11 +99,11 @@ bool Core::Network::SapphireAPI::createAccount( const std::string& username, con
int32_t accountId = pQR->fetch()[0].getUInt32() + 1;
// store the account to the db
g_database.execute( "INSERT INTO accounts (account_Id, account_name, account_pass, account_created) VALUE(%i, '%s', '%s', %i);",
accountId,
username.c_str(),
pass.c_str(),
time( NULL ) );
g_database.execute( "INSERT INTO accounts (account_Id, account_name, account_pass, account_created) VALUE( " +
std::to_string( accountId ) + ", '" +
username + "', '" +
pass + "', " +
std::to_string( time( nullptr ) ) + ");");
if( !login( username, pass, sId ) )
@ -305,4 +305,4 @@ bool Core::Network::SapphireAPI::removeSession( const std::string& sId )
m_sessionMap.erase( sId );
return true;
}
}

10
src/servers/Server_Zone/Actor/PlayerSql.cpp
View file

@ -404,7 +404,7 @@ void Core::Entity::Player::createUpdateSql()
updateCharaInfoSearch += entry + ", ";
updateCharaInfoSearch += condition;
g_database.execute( updateCharaInfoSearch.c_str() );
g_database.execute( updateCharaInfoSearch );
}
if( !charaBaseSet.empty() )
@ -413,7 +413,7 @@ void Core::Entity::Player::createUpdateSql()
updateCharaBase += entry + ", ";
updateCharaBase += condition;
g_database.execute( updateCharaBase.c_str() );
g_database.execute( updateCharaBase );
}
if( !charaDetailSet.empty() )
@ -422,7 +422,7 @@ void Core::Entity::Player::createUpdateSql()
updateCharaDetail += entry + ", ";
updateCharaDetail += condition;
g_database.execute( updateCharaDetail.c_str() );
g_database.execute( updateCharaDetail );
}
if( !charaClassSet.empty() )
@ -431,7 +431,7 @@ void Core::Entity::Player::createUpdateSql()
updateCharaClass += entry + ", ";
updateCharaClass += condition;
g_database.execute( updateCharaClass.c_str() );
g_database.execute( updateCharaClass );
}
if( !charaQuestSet.empty() )
@ -440,7 +440,7 @@ void Core::Entity::Player::createUpdateSql()
updateCharaQuest += entry + ", ";
updateCharaQuest += condition;
g_database.execute( updateCharaQuest.c_str() );
g_database.execute( updateCharaQuest );
}
m_updateFlags = PlayerSyncFlags::None;

4
src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
View file

@ -237,8 +237,8 @@ void Core::DebugCommandHandler::set( char * data, Core::Entity::PlayerPtr pPlaye
"', '" + std::to_string( map_id ) +
"', '" + std::to_string( discover_id ) + "')";
g_database.execute( query1.c_str() );
g_database.execute( query2.c_str() );
g_database.execute( query1 );
g_database.execute( query2 );
}

5
src/servers/Server_Zone/Inventory/ItemContainer.cpp
View file

@ -42,9 +42,8 @@ void Core::ItemContainer::removeItem( uint8_t slotId )
{
g_database.execute( "DELETE FROM charaglobalitem " \
"WHERE itemId = %i ",
it->second->getUId() );
g_database.execute( "DELETE FROM charaglobalitem WHERE itemId = " +
std::to_string( it->second->getUId() ) );
m_itemMap.erase( it );