aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/game/AuctionHouseBot.cpp20
-rw-r--r--src/game/CreatureGroups.cpp8
-rw-r--r--src/game/Level1.cpp2
-rw-r--r--src/game/Level2.cpp10
-rw-r--r--src/game/Level3.cpp6
-rw-r--r--src/game/ObjectMgr.cpp14
-rw-r--r--src/game/WaypointManager.cpp6
-rw-r--r--src/game/Wintergrasp.cpp18
-rw-r--r--src/shared/Database/DBCStore.h4
-rw-r--r--src/shared/Database/QueryResultPostgre.h1
-rw-r--r--src/trinitycore/Master.cpp2
11 files changed, 45 insertions, 46 deletions
diff --git a/src/game/AuctionHouseBot.cpp b/src/game/AuctionHouseBot.cpp
index 6ce263ba8d0..c343ebf4544 100644
--- a/src/game/AuctionHouseBot.cpp
+++ b/src/game/AuctionHouseBot.cpp
@@ -854,7 +854,7 @@ void AuctionHouseBot::Initialize()
if (AHBSeller)
{
QueryResult* results = (QueryResult*) NULL;
- char npcQuery[] = "SELECT distinct `item` FROM `npc_vendor`";
+ char npcQuery[] = "SELECT distinct item FROM npc_vendor";
results = WorldDatabase.PQuery(npcQuery);
if (results != NULL)
{
@@ -872,15 +872,15 @@ void AuctionHouseBot::Initialize()
if (debug_Out) sLog.outString("AuctionHouseBot: \"%s\" failed", npcQuery);
}
- char lootQuery[] = "SELECT `item` FROM `creature_loot_template` UNION "
- "SELECT `item` FROM `disenchant_loot_template` UNION "
- "SELECT `item` FROM `fishing_loot_template` UNION "
- "SELECT `item` FROM `gameobject_loot_template` UNION "
- "SELECT `item` FROM `item_loot_template` UNION "
- "SELECT `item` FROM `milling_loot_template` UNION "
- "SELECT `item` FROM `pickpocketing_loot_template` UNION "
- "SELECT `item` FROM `prospecting_loot_template` UNION "
- "SELECT `item` FROM `skinning_loot_template`";
+ char lootQuery[] = "SELECT item FROM creature_loot_template UNION "
+ "SELECT item FROM disenchant_loot_template UNION "
+ "SELECT item FROM fishing_loot_template UNION "
+ "SELECT item FROM gameobject_loot_template UNION "
+ "SELECT item FROM item_loot_template UNION "
+ "SELECT item FROM milling_loot_template UNION "
+ "SELECT item FROM pickpocketing_loot_template UNION "
+ "SELECT item FROM prospecting_loot_template UNION "
+ "SELECT item FROM skinning_loot_template";
results = WorldDatabase.PQuery(lootQuery);
if (results != NULL)
diff --git a/src/game/CreatureGroups.cpp b/src/game/CreatureGroups.cpp
index 69a4b96f06c..97610754e69 100644
--- a/src/game/CreatureGroups.cpp
+++ b/src/game/CreatureGroups.cpp
@@ -78,21 +78,21 @@ void CreatureGroupManager::LoadCreatureFormations()
CreatureGroupMap.clear();
//Check Integrity of the table
- QueryResult *result = WorldDatabase.PQuery("SELECT MAX(`leaderGUID`) FROM `creature_formations`");
+ QueryResult *result = WorldDatabase.PQuery("SELECT MAX(leaderGUID) FROM creature_formations");
if(!result)
{
- sLog.outErrorDb(" ...an error occured while loading the table `creature_formations` ( maybe it doesn't exist ?)\n");
+ sLog.outErrorDb(" ...an error occured while loading the table creature_formations ( maybe it doesn't exist ?)\n");
return;
}
delete result;
//Get group data
- result = WorldDatabase.PQuery("SELECT `leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI` FROM `creature_formations` ORDER BY `leaderGUID`");
+ result = WorldDatabase.PQuery("SELECT leaderGUID, memberGUID, dist, angle, groupAI FROM creature_formations ORDER BY leaderGUID");
if(!result)
{
- sLog.outErrorDb("The table `creature_formations` is empty or corrupted");
+ sLog.outErrorDb("The table creature_formations is empty or corrupted");
return;
}
diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp
index e817fc744ba..0732abda83d 100644
--- a/src/game/Level1.cpp
+++ b/src/game/Level1.cpp
@@ -499,7 +499,7 @@ bool ChatHandler::HandleGMTicketAssignToCommand(const char* args)
}
uint64 tarGUID = objmgr.GetPlayerGUIDByName(targm.c_str());
uint64 accid = objmgr.GetPlayerAccountIdByGUID(tarGUID);
- QueryResult *result = loginDatabase.PQuery("SELECT `gmlevel` FROM `account` WHERE `id` = '%u'", accid);
+ QueryResult *result = loginDatabase.PQuery("SELECT gmlevel FROM account WHERE id = '%u'", accid);
if(!tarGUID|| !result || result->Fetch()->GetUInt32() < SEC_MODERATOR)
{
SendSysMessage(LANG_COMMAND_TICKETASSIGNERROR_A);
diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp
index 842fba4f10c..5e545fa5a41 100644
--- a/src/game/Level2.cpp
+++ b/src/game/Level2.cpp
@@ -2490,7 +2490,7 @@ bool ChatHandler::HandleWpEventCommand(const char* args)
if(id)
{
- QueryResult *result = WorldDatabase.PQuery( "SELECT `id` FROM waypoint_scripts WHERE guid = %u", id);
+ QueryResult *result = WorldDatabase.PQuery( "SELECT id FROM waypoint_scripts WHERE guid = %u", id);
if( !result )
{
@@ -2528,7 +2528,7 @@ bool ChatHandler::HandleWpEventCommand(const char* args)
float a8, a9, a10, a11;
char const* a7;
- QueryResult *result = WorldDatabase.PQuery( "SELECT `guid`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o` FROM waypoint_scripts WHERE id = %u", id);
+ QueryResult *result = WorldDatabase.PQuery( "SELECT guid, delay, command, datalong, datalong2, dataint, x, y, z, o FROM waypoint_scripts WHERE id = %u", id);
if( !result )
{
@@ -2563,7 +2563,7 @@ bool ChatHandler::HandleWpEventCommand(const char* args)
{
id = atoi(arg_id);
- QueryResult *result = WorldDatabase.PQuery( "SELECT `guid` FROM waypoint_scripts WHERE guid = %u", id);
+ QueryResult *result = WorldDatabase.PQuery( "SELECT guid FROM waypoint_scripts WHERE guid = %u", id);
if( result )
{
@@ -4225,7 +4225,7 @@ bool ChatHandler::HandleNpcAddFormationCommand(const char* args)
CreatureGroupMap[lowguid] = group_member;
pCreature->SearchFormationAndPath();
- WorldDatabase.PExecuteLog("INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`) VALUES ('%u','%u','%f', '%f', '%u')",
+ WorldDatabase.PExecuteLog("INSERT INTO creature_formations (leaderGUID, memberGUID, dist, angle, groupAI) VALUES ('%u','%u','%f', '%f', '%u')",
leaderGUID, lowguid, group_member->follow_dist, group_member->follow_angle, group_member->groupAI);
PSendSysMessage("Creature %u added to formation with leader %u", lowguid, leaderGUID);
@@ -4251,7 +4251,7 @@ bool ChatHandler::HandleNpcSetLinkCommand(const char* args)
if(!pCreature->GetDBTableGUIDLow())
{
- PSendSysMessage("Selected creature isn't in `creature` table", pCreature->GetGUIDLow());
+ PSendSysMessage("Selected creature isn't in creature table", pCreature->GetGUIDLow());
SetSentErrorMessage(true);
return false;
}
diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index fdff7de644c..025a367528c 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -7402,7 +7402,7 @@ bool ChatHandler::HandleUnFreezeCommand(const char *args)
if (TargetName)
{
//check for offline players
- QueryResult *result = CharacterDatabase.PQuery("SELECT characters.guid FROM `characters` WHERE characters.name = '%s'",name.c_str());
+ QueryResult *result = CharacterDatabase.PQuery("SELECT characters.guid FROM characters WHERE characters.name = '%s'",name.c_str());
if(!result)
{
SendSysMessage(LANG_COMMAND_FREEZE_WRONG);
@@ -7412,7 +7412,7 @@ bool ChatHandler::HandleUnFreezeCommand(const char *args)
Field *fields=result->Fetch();
uint64 pguid = fields[0].GetUInt64();
delete result;
- CharacterDatabase.PQuery("DELETE FROM `character_aura` WHERE character_aura.spell = 9454 AND character_aura.guid = '%u'",pguid);
+ CharacterDatabase.PQuery("DELETE FROM character_aura WHERE character_aura.spell = 9454 AND character_aura.guid = '%u'",pguid);
PSendSysMessage(LANG_COMMAND_UNFREEZE,name.c_str());
return true;
}
@@ -7429,7 +7429,7 @@ bool ChatHandler::HandleUnFreezeCommand(const char *args)
bool ChatHandler::HandleListFreezeCommand(const char* args)
{
//Get names from DB
- QueryResult *result = CharacterDatabase.PQuery("SELECT characters.name FROM `characters` LEFT JOIN `character_aura` ON (characters.guid = character_aura.guid) WHERE character_aura.spell = 9454");
+ QueryResult *result = CharacterDatabase.PQuery("SELECT characters.name FROM characters LEFT JOIN character_aura ON (characters.guid = character_aura.guid) WHERE character_aura.spell = 9454");
if(!result)
{
SendSysMessage(LANG_COMMAND_NO_FROZEN_PLAYERS);
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 39ff3891077..a1e19eb178a 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -1214,14 +1214,14 @@ bool ObjectMgr::SetCreatureLinkedRespawn(uint32 guid, uint32 linkedGuid)
if(!linkedGuid) // we're removing the linking
{
mCreatureLinkedRespawnMap.erase(guid);
- WorldDatabase.DirectPExecute("DELETE FROM `creature_linked_respawn` WHERE `guid` = '%u'",guid);
+ WorldDatabase.DirectPExecute("DELETE FROM creature_linked_respawn WHERE guid = '%u'",guid);
return true;
}
if(CheckCreatureLinkedRespawn(guid,linkedGuid)) // we add/change linking
{
mCreatureLinkedRespawnMap[guid] = linkedGuid;
- WorldDatabase.DirectPExecute("REPLACE INTO `creature_linked_respawn`(`guid`,`linkedGuid`) VALUES ('%u','%u')",guid,linkedGuid);
+ WorldDatabase.DirectPExecute("REPLACE INTO creature_linked_respawn (guid,linkedGuid) VALUES ('%u','%u')",guid,linkedGuid);
return true;
}
return false;
@@ -4637,7 +4637,7 @@ void ObjectMgr::LoadWaypointScripts()
for(ScriptMapMap::const_iterator itr = sWaypointScripts.begin(); itr != sWaypointScripts.end(); ++itr)
{
- QueryResult *query = WorldDatabase.PQuery("SELECT * FROM `waypoint_scripts` WHERE `id` = %u", itr->first);
+ QueryResult *query = WorldDatabase.PQuery("SELECT * FROM waypoint_scripts WHERE id = %u", itr->first);
if(!query || !query->GetRowCount())
sLog.outErrorDb("There is no waypoint which links to the waypoint script %u", itr->first);
}
@@ -8540,7 +8540,7 @@ void ObjectMgr::LoadGMTickets()
{
m_GMTicketList.clear();
- QueryResult *result = CharacterDatabase.Query( "SELECT `guid`, `playerGuid`, `name`, `message`, `createtime`, `map`, `posX`, `posY`, `posZ`, `timestamp`, `closed`, `assignedto`, `comment` FROM `gm_tickets`" );
+ QueryResult *result = CharacterDatabase.Query( "SELECT guid, playerGuid, name, message, createtime, map, posX, posY, posZ, timestamp, closed, assignedto, comment FROM gm_tickets" );
if(!result)
{
@@ -8575,7 +8575,7 @@ void ObjectMgr::LoadGMTickets()
} while( result->NextRow() );
- result = CharacterDatabase.PQuery("SELECT MAX(`guid`) from `gm_tickets`");
+ result = CharacterDatabase.PQuery("SELECT MAX(guid) from gm_tickets");
m_GMticketid = (*result)[0].GetUInt64();
sLog.outString(">>> %u GM Tickets loaded from the database.", count);
@@ -8597,7 +8597,7 @@ void ObjectMgr::_AddOrUpdateGMTicket(GM_Ticket &ticket)
CharacterDatabase.escape_string(name);
CharacterDatabase.escape_string(comment);
std::ostringstream ss;
- ss << "REPLACE INTO `gm_tickets` (`guid`, `playerGuid`, `name`, `message`, `createtime`, `map`, `posX`, `posY`, `posZ`, `timestamp`, `closed`, `assignedto`, `comment`) VALUES('";
+ ss << "REPLACE INTO gm_tickets (guid, playerGuid, name, message, createtime, map, posX, posY, posZ, timestamp, closed, assignedto, comment) VALUES('";
ss << ticket.guid << "', '";
ss << ticket.playerGuid << "', '";
ss << name << "', '";
@@ -8623,7 +8623,7 @@ void ObjectMgr::RemoveGMTicket(GM_Ticket *ticket, int64 source, bool permanently
{
if(permanently)
{
- CharacterDatabase.PExecute("DELETE FROM `gm_tickets` WHERE `guid` = '%u'", ticket->guid);
+ CharacterDatabase.PExecute("DELETE FROM gm_tickets WHERE guid = '%u'", ticket->guid);
i = m_GMTicketList.erase(i);
ticket = NULL;
return;
diff --git a/src/game/WaypointManager.cpp b/src/game/WaypointManager.cpp
index 3ebbef7fc87..a779641c1c1 100644
--- a/src/game/WaypointManager.cpp
+++ b/src/game/WaypointManager.cpp
@@ -34,7 +34,7 @@ void WaypointStore::Free()
void WaypointStore::Load()
{
- QueryResult *result = WorldDatabase.PQuery("SELECT COUNT(`id`) FROM `waypoint_data`");
+ QueryResult *result = WorldDatabase.PQuery("SELECT COUNT(id) FROM waypoint_data");
if(!result)
{
sLog.outError("an error occured while loading the table `waypoint_data` (maybe it doesn't exist ?)");
@@ -44,7 +44,7 @@ void WaypointStore::Load()
records = (*result)[0].GetUInt32();
delete result;
- result = WorldDatabase.PQuery("SELECT `id`,`point`,`position_x`,`position_y`,`position_z`,`move_flag`,`delay`,`action`,`action_chance` FROM `waypoint_data` ORDER BY `id`, `point`");
+ result = WorldDatabase.PQuery("SELECT id,point,position_x,position_y,position_z,move_flag,delay,action,action_chance FROM waypoint_data ORDER BY id, point");
if(!result)
{
sLog.outErrorDb("The table `waypoint_data` is empty or corrupted");
@@ -112,7 +112,7 @@ void WaypointStore::UpdatePath(uint32 id)
QueryResult *result;
- result = WorldDatabase.PQuery("SELECT `id`,`point`,`position_x`,`position_y`,`position_z`,`move_flag`,`delay`,`action`,`action_chance` FROM `waypoint_data` WHERE id = %u ORDER BY `point`", id);
+ result = WorldDatabase.PQuery("SELECT id,point,position_x,position_y,position_z,move_flag,delay,action,action_chance FROM waypoint_data WHERE id = %u ORDER BY point", id);
if(!result)
return;
diff --git a/src/game/Wintergrasp.cpp b/src/game/Wintergrasp.cpp
index ec43a887e1a..8f23f799faa 100644
--- a/src/game/Wintergrasp.cpp
+++ b/src/game/Wintergrasp.cpp
@@ -98,12 +98,12 @@ bool OPvPWintergrasp::SetupOutdoorPvP()
}
minX -= 20; minY -= 20; maxX += 20; maxY += 20;
- QueryResult *result = WorldDatabase.PQuery("SELECT `guid` FROM `gameobject`,`gameobject_template`"
- " WHERE `gameobject`.`map`=571"
- " AND `gameobject`.`position_x`>%f AND `gameobject`.`position_y`>%f"
- " AND `gameobject`.`position_x`<%f AND `gameobject`.`position_y`<%f"
- " AND `gameobject_template`.`type`=33"
- " AND `gameobject`.`id`=`gameobject_template`.`entry`",
+ QueryResult *result = WorldDatabase.PQuery("SELECT guid FROM gameobject,gameobject_template"
+ " WHERE gameobject.map=571"
+ " AND gameobject.position_x>%f AND gameobject.position_y>%f"
+ " AND gameobject.position_x<%f AND gameobject.position_y<%f"
+ " AND gameobject_template.type=33"
+ " AND gameobject.id=gameobject_template.entry",
minX, minY, maxX, maxY);
if(!result)
return false;
@@ -172,9 +172,9 @@ bool OPvPWintergrasp::SetupOutdoorPvP()
{
uint32 engGuid = 0;
- QueryResult *result = WorldDatabase.PQuery("SELECT `guid` FROM `creature`"
- " WHERE `creature`.`map`=571"
- " AND `creature`.`id` IN (%u, %u);", CRE_ENG_A, CRE_ENG_H);
+ QueryResult *result = WorldDatabase.PQuery("SELECT guid FROM creature"
+ " WHERE creature.map=571"
+ " AND creature.id IN (%u, %u);", CRE_ENG_A, CRE_ENG_H);
if(!result)
{
diff --git a/src/shared/Database/DBCStore.h b/src/shared/Database/DBCStore.h
index e88253564d3..e02265ec523 100644
--- a/src/shared/Database/DBCStore.h
+++ b/src/shared/Database/DBCStore.h
@@ -87,9 +87,9 @@ class DBCStorage
// Load data from sql
if (sql)
{
- std::string query = "SELECT * FROM `" + sql->sqlTableName;
+ std::string query = "SELECT * FROM " + sql->sqlTableName;
if (sql->indexPos >= 0)
- query +="` ORDER BY + `" + *sql->indexName + "` DESC";
+ query +=" ORDER BY + " + *sql->indexName + " DESC";
query += ";";
result = WorldDatabase.Query(query.c_str());
diff --git a/src/shared/Database/QueryResultPostgre.h b/src/shared/Database/QueryResultPostgre.h
index a48c6d21fee..3539a680ce7 100644
--- a/src/shared/Database/QueryResultPostgre.h
+++ b/src/shared/Database/QueryResultPostgre.h
@@ -25,7 +25,6 @@
#define FD_SETSIZE 1024
#include <winsock2.h>
#include <postgre/libpq-fe.h>
-#include <postgre/postgres.h>
#include <postgre/pg_type.h>
#else
#include <libpq-fe.h>
diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp
index 77dfca02f48..b8c51461a67 100644
--- a/src/trinitycore/Master.cpp
+++ b/src/trinitycore/Master.cpp
@@ -491,7 +491,7 @@ bool Master::_StartDB()
clearOnlineAccounts();
///- Insert version info into DB
- WorldDatabase.PExecute("UPDATE `version` SET `core_version` = '%s', `core_revision` = '%s'", _FULLVERSION, _REVISION);
+ WorldDatabase.PExecute("UPDATE version SET core_version = '%s', core_revision = '%s'", _FULLVERSION, _REVISION);
sWorld.LoadDBVersion();