yolinlin/mod-ale
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-ale synced 2025-11-29 15:38:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Trinity SQLTransaction

Browse Source 
Ungroups Trinity from AzerothCore when necessary
Replaces SQLTransaction by CharacterDatabaseTransaction
This commit is contained in:
RedSkull-666
2020-03-31 19:29:24 +02:00
parent 042629ea61
commit c58135b161
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
GlobalMethods.h
View File

@@ -2094,7 +2094,9 @@ namespace LuaGlobalFunctions
draft.SetMoney(money); draft.SetMoney(money);
#endif #endif
#if defined TRINITY || AZEROTHCORE #if defined TRINITY
CharacterDatabaseTransaction trans = CharacterDatabase.BeginTransaction();
#elif defined AZEROTHCORE
SQLTransaction trans = CharacterDatabase.BeginTransaction(); SQLTransaction trans = CharacterDatabase.BeginTransaction();
#endif #endif
uint8 addedItems = 0; uint8 addedItems = 0;

9
GuildMethods.h
View File

@@ -254,7 +254,7 @@ namespace LuaGuild
uint8 rankId = Eluna::CHECKVAL<uint8>(L, 3, GUILD_RANK_NONE); uint8 rankId = Eluna::CHECKVAL<uint8>(L, 3, GUILD_RANK_NONE);
#ifdef TRINITY #ifdef TRINITY
SQLTransaction trans(nullptr); CharacterDatabaseTransaction trans(nullptr);
guild->AddMember(trans, player->GET_GUID(), rankId); guild->AddMember(trans, player->GET_GUID(), rankId);
#else #else
guild->AddMember(player->GET_GUID(), rankId); guild->AddMember(player->GET_GUID(), rankId);
@@ -273,7 +273,10 @@ namespace LuaGuild
Player* player = Eluna::CHECKOBJ<Player>(L, 2); Player* player = Eluna::CHECKOBJ<Player>(L, 2);
bool isDisbanding = Eluna::CHECKVAL<bool>(L, 3, false); bool isDisbanding = Eluna::CHECKVAL<bool>(L, 3, false);
#if defined TRINITY || AZEROTHCORE #if defined TRINITY
CharacterDatabaseTransaction trans(nullptr);
guild->DeleteMember(trans, player->GET_GUID(), isDisbanding);
#elif defined AZEROTHCORE
SQLTransaction trans(nullptr); SQLTransaction trans(nullptr);
guild->DeleteMember(trans, player->GET_GUID(), isDisbanding); guild->DeleteMember(trans, player->GET_GUID(), isDisbanding);
#else #else
@@ -294,7 +297,7 @@ namespace LuaGuild
uint8 newRank = Eluna::CHECKVAL<uint8>(L, 3); uint8 newRank = Eluna::CHECKVAL<uint8>(L, 3);
#ifdef TRINITY #ifdef TRINITY
SQLTransaction trans(nullptr); CharacterDatabaseTransaction trans(nullptr);
guild->ChangeMemberRank(trans, player->GET_GUID(), newRank); guild->ChangeMemberRank(trans, player->GET_GUID(), newRank);
#else #else
guild->ChangeMemberRank(player->GET_GUID(), newRank); guild->ChangeMemberRank(player->GET_GUID(), newRank);

5
ItemMethods.h
View File

@@ -740,7 +740,10 @@ namespace LuaItem
*/ */
int SaveToDB(lua_State* /*L*/, Item* item) int SaveToDB(lua_State* /*L*/, Item* item)
{ {
#if defined TRINITY || AZEROTHCORE #if defined TRINITY
CharacterDatabaseTransaction trans = CharacterDatabaseTransaction(nullptr);
item->SaveToDB(trans);
#elif defined AZEROTHCORE
SQLTransaction trans = SQLTransaction(NULL); SQLTransaction trans = SQLTransaction(NULL);
item->SaveToDB(trans); item->SaveToDB(trans);
#else #else

2
PlayerMethods.h
View File

@@ -2913,7 +2913,7 @@ namespace LuaPlayer
if (sWorld->getBoolConfig(CONFIG_QUEST_ENABLE_QUEST_TRACKER)) // check if Quest Tracker is enabled if (sWorld->getBoolConfig(CONFIG_QUEST_ENABLE_QUEST_TRACKER)) // check if Quest Tracker is enabled
{ {
// prepare Quest Tracker datas // prepare Quest Tracker datas
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_QUEST_TRACK_GM_COMPLETE); CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_QUEST_TRACK_GM_COMPLETE);
stmt->setUInt32(0, quest->GetQuestId()); stmt->setUInt32(0, quest->GetQuestId());
stmt->setUInt32(1, player->GetGUID().GetCounter()); stmt->setUInt32(1, player->GetGUID().GetCounter());