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

[8586] Fixed sql query to be compatible with PGSQL.

Browse source 
Signed-off-by: ApoC <apoc@nymfe.net>
This commit is contained in:
ApoC 2009-10-06 03:05:49 +02:00
parent a0079ed59d
commit b9168145b5
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/game/BattleGroundMgr.cpp
View file

@ -2103,34 +2103,34 @@ void BattleGroundMgr::LoadBattleEventIndexes()
QueryResult *result = QueryResult *result =
// 0 1 2 3 4 5 6 // 0 1 2 3 4 5 6
WorldDatabase.PQuery( "SELECT data.typ, data.guid1, data.ev1 ev1, data.ev2 ev2, data.map m, data.guid2, description.map, " WorldDatabase.PQuery( "SELECT data.typ, data.guid1, data.ev1 AS ev1, data.ev2 AS ev2, data.map AS m, data.guid2, description.map, "
// 7 8 9 // 7 8 9
"description.event1, description.event2, description.description " "description.event1, description.event2, description.description "
"FROM " "FROM "
"(SELECT 1 typ, a.guid guid1, a.event1 ev1, a.event2 ev2, b.map map, b.guid guid2 " "(SELECT '1' AS typ, a.guid AS guid1, a.event1 AS ev1, a.event2 AS ev2, b.map AS map, b.guid AS guid2 "
"FROM gameobject_battleground a " "FROM gameobject_battleground AS a "
"LEFT OUTER JOIN gameobject b ON a.guid = b.guid " "LEFT OUTER JOIN gameobject AS b ON a.guid = b.guid "
"UNION " "UNION "
"SELECT 2 typ, a.guid guid1, a.event1 ev1, a.event2 ev2, b.map map, b.guid guid2 " "SELECT '2' AS typ, a.guid AS guid1, a.event1 AS ev1, a.event2 AS ev2, b.map AS map, b.guid AS guid2 "
"FROM creature_battleground a " "FROM creature_battleground AS a "
"LEFT OUTER JOIN creature b ON a.guid = b.guid " "LEFT OUTER JOIN creature AS b ON a.guid = b.guid "
") data " ") data "
"RIGHT OUTER JOIN battleground_events description ON data.map = description.map " "RIGHT OUTER JOIN battleground_events AS description ON data.map = description.map "
"AND data.ev1 = description.event1 AND data.ev2 = description.event2 " "AND data.ev1 = description.event1 AND data.ev2 = description.event2 "
// full outer join doesn't work in mysql :-/ so just UNION-select the same again and add a left outer join // full outer join doesn't work in mysql :-/ so just UNION-select the same again and add a left outer join
"UNION " "UNION "
"SELECT data.typ, data.guid1, data.ev1, data.ev2, data.map, data.guid2, description.map, " "SELECT data.typ, data.guid1, data.ev1, data.ev2, data.map, data.guid2, description.map, "
"description.event1, description.event2, description.description " "description.event1, description.event2, description.description "
"FROM " "FROM "
"(SELECT 1 typ, a.guid guid1, a.event1 ev1, a.event2 ev2, b.map map, b.guid guid2 " "(SELECT '1' AS typ, a.guid AS guid1, a.event1 AS ev1, a.event2 AS ev2, b.map AS map, b.guid AS guid2 "
"FROM gameobject_battleground a " "FROM gameobject_battleground AS a "
"LEFT OUTER JOIN gameobject b ON a.guid = b.guid " "LEFT OUTER JOIN gameobject AS b ON a.guid = b.guid "
"UNION " "UNION "
"SELECT 2 typ, a.guid guid1, a.event1 ev1, a.event2 ev2, b.map map, b.guid guid2 " "SELECT '2' AS typ, a.guid AS guid1, a.event1 AS ev1, a.event2 AS ev2, b.map AS map, b.guid AS guid2 "
"FROM creature_battleground a " "FROM creature_battleground AS a "
"LEFT OUTER JOIN creature b ON a.guid = b.guid " "LEFT OUTER JOIN creature AS b ON a.guid = b.guid "
") data " ") data "
"LEFT OUTER JOIN battleground_events description ON data.map = description.map " "LEFT OUTER JOIN battleground_events AS description ON data.map = description.map "
"AND data.ev1 = description.event1 AND data.ev2 = description.event2 " "AND data.ev1 = description.event1 AND data.ev2 = description.event2 "
"ORDER BY m, ev1, ev2" ); "ORDER BY m, ev1, ev2" );
if( !result ) if( !result )

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "8585" #define REVISION_NR "8586"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__