mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 06:27:45 +00:00
Code Activity

Simplified usage of new database class

Browse source
This commit is contained in:
Mordred Admin 2017-10-27 14:01:50 +02:00
parent 55dcdc2b87
commit 4d167ad22f
10 changed files with 21 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/servers/Server_Common/Database/DatabaseDef.h Normal file
View file

@ -0,0 +1,12 @@
#ifndef _DATABASEDEF_H
#define _DATABASEDEF_H
#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h"
#include <Server_Common/Database/DbLoader.h>
#include <Server_Common/Database/CharaDbConnection.h>
#include <Server_Common/Database/DbWorkerPool.h>
#include <Server_Common/Database/PreparedStatement.h>
extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb;
#endif

8
src/servers/Server_REST/PlayerMinimal.cpp
View file

@ -4,14 +4,8 @@
#include <Server_Common/Common.h> #include <Server_Common/Common.h>
#include <Server_Common/Exd/ExdData.h> #include <Server_Common/Exd/ExdData.h>
#include <Server_Common/Database/DbLoader.h> #include <Server_Common/Database/DatabaseDef.h>
#include <Server_Common/Database/CharaDbConnection.h>
#include <Server_Common/Database/DbWorkerPool.h>
#include <Server_Common/Database/PreparedStatement.h>
#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h"
extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb;
extern Core::Data::ExdData g_exdData; extern Core::Data::ExdData g_exdData;
namespace Core { namespace Core {

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

@ -10,16 +10,10 @@
#include <boost/property_tree/json_parser.hpp> #include <boost/property_tree/json_parser.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <Server_Common/Database/DbLoader.h>
#include <Server_Common/Database/CharaDbConnection.h>
#include <Server_Common/Database/DbWorkerPool.h>
#include <Server_Common/Database/PreparedStatement.h>
#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h" #include <Server_Common/Database/DatabaseDef.h>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb;
Core::Network::SapphireAPI::SapphireAPI() Core::Network::SapphireAPI::SapphireAPI()
{ {

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

@ -29,13 +29,8 @@
#include "src/servers/Server_Zone/StatusEffect/StatusEffectContainer.h" #include "src/servers/Server_Zone/StatusEffect/StatusEffectContainer.h"
#include "src/servers/Server_Zone/Inventory/Inventory.h" #include "src/servers/Server_Zone/Inventory/Inventory.h"
#include <Server_Common/Database/DbLoader.h> #include <Server_Common/Database/DatabaseDef.h>
#include <Server_Common/Database/CharaDbConnection.h>
#include <Server_Common/Database/DbWorkerPool.h>
#include <Server_Common/Database/PreparedStatement.h>
#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h"
extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb;
extern Core::Logger g_log; extern Core::Logger g_log;
extern Core::ServerZone g_serverZone; extern Core::ServerZone g_serverZone;
extern Core::ZoneMgr g_zoneMgr; extern Core::ZoneMgr g_zoneMgr;

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

@ -30,13 +30,8 @@
#include "src/servers/Server_Zone/Session.h" #include "src/servers/Server_Zone/Session.h"
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h" #include <Server_Common/Database/DatabaseDef.h>
#include <Server_Common/Database/DbLoader.h>
#include <Server_Common/Database/CharaDbConnection.h>
#include <Server_Common/Database/DbWorkerPool.h>
#include <Server_Common/Database/PreparedStatement.h>
extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb;
extern Core::Scripting::ScriptManager g_scriptMgr; extern Core::Scripting::ScriptManager g_scriptMgr;
extern Core::Data::ExdData g_exdData; extern Core::Data::ExdData g_exdData;
extern Core::Logger g_log; extern Core::Logger g_log;

7
src/servers/Server_Zone/Inventory/Inventory.cpp
View file

@ -17,13 +17,8 @@
#include "src/servers/Server_Zone/Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
#include <Server_Common/Database/DbLoader.h> #include <Server_Common/Database/DatabaseDef.h>
#include <Server_Common/Database/CharaDbConnection.h>
#include <Server_Common/Database/DbWorkerPool.h>
#include <Server_Common/Database/PreparedStatement.h>
#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h"
extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb;
extern Core::Logger g_log; extern Core::Logger g_log;
extern Core::Data::ExdData g_exdData; extern Core::Data::ExdData g_exdData;

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

@ -8,13 +8,8 @@
#include "Item.h" #include "Item.h"
#include <Server_Common/Database/DbLoader.h> #include <Server_Common/Database/DatabaseDef.h>
#include <Server_Common/Database/CharaDbConnection.h>
#include <Server_Common/Database/DbWorkerPool.h>
#include <Server_Common/Database/PreparedStatement.h>
#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h"
extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb;
extern Core::Logger g_log; extern Core::Logger g_log;
Core::ItemContainer::ItemContainer( uint16_t locationId ) : Core::ItemContainer::ItemContainer( uint16_t locationId ) :

7
src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp
View file

@ -37,13 +37,8 @@
#include "src/servers/Server_Zone/Action/Action.h" #include "src/servers/Server_Zone/Action/Action.h"
#include "src/servers/Server_Zone/Action/ActionTeleport.h" #include "src/servers/Server_Zone/Action/ActionTeleport.h"
#include <Server_Common/Database/DbLoader.h> #include <Server_Common/Database/DatabaseDef.h>
#include <Server_Common/Database/CharaDbConnection.h>
#include <Server_Common/Database/DbWorkerPool.h>
#include <Server_Common/Database/PreparedStatement.h>
#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h"
extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb;
extern Core::Logger g_log; extern Core::Logger g_log;
extern Core::ServerZone g_serverZone; extern Core::ServerZone g_serverZone;
extern Core::ZoneMgr g_zoneMgr; extern Core::ZoneMgr g_zoneMgr;

7
src/servers/Server_Zone/Zone/Zone.cpp
View file

@ -29,13 +29,8 @@
#include <time.h> #include <time.h>
#include <Server_Common/Database/DbLoader.h> #include <Server_Common/Database/DatabaseDef.h>
#include <Server_Common/Database/CharaDbConnection.h>
#include <Server_Common/Database/DbWorkerPool.h>
#include <Server_Common/Database/PreparedStatement.h>
#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h"
extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb;
extern Core::Logger g_log; extern Core::Logger g_log;
extern Core::ServerZone g_serverZone; extern Core::ServerZone g_serverZone;
extern Core::Data::ExdData g_exdData; extern Core::Data::ExdData g_exdData;

7
src/servers/Server_Zone/Zone/ZoneMgr.cpp
View file

@ -7,13 +7,8 @@
#include "ZonePosition.h" #include "ZonePosition.h"
#include <Server_Common/Database/DbLoader.h> #include <Server_Common/Database/DatabaseDef.h>
#include <Server_Common/Database/CharaDbConnection.h>
#include <Server_Common/Database/DbWorkerPool.h>
#include <Server_Common/Database/PreparedStatement.h>
#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h"
extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb;
extern Core::Logger g_log; extern Core::Logger g_log;
extern Core::Data::ExdData g_exdData; extern Core::Data::ExdData g_exdData;