change: Guild manager stuff

add: Callback AsyncQuery.
fix: Multiple missing `txn.commit()`.

.vscode/settings.json

@@ -86,17 +86,17 @@
   "vcpkg.target.useManifest": false,
   "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
   "cmake.configureArgs": [
-    "-DVCPKG_MANIFEST_MODE=OFF",
     "-DVCPKG_APPLOCAL_DEPS=ON",
     "-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON",
-    "-DVCPKG_TARGET_TRIPLET=x64-linux"
+    "-DVCPKG_TARGET_TRIPLET=x64-linux",
+    "-DVCPKG_MANIFEST_MODE=OFF"
   ],
   "vcpkg.general.enable": true,
   "vcpkg.target.hostTriplet": "x64-linux",
   "vcpkg.target.defaultTriplet": "x64-linux",
   "vcpkg.target.useStaticLib": false,
   "cmake.configureSettings": {
-    "CMAKE_TOOLCHAIN_FILE": "~/.vcpkg/scripts/buildsystems/vcpkg.cmake"
+    "CMAKE_TOOLCHAIN_FILE": "~/.local/share/vcpkg/scripts/buildsystems/vcpkg.cmake"
   },
   "vcpkg.target.installDependencies": true,
   "vcpkg.target.preferSystemLibs": false

TODO.md

@@ -12,6 +12,6 @@
   - [x] DBManager
   - [ ] GuildManager
   - [ ] ItemAwardManager
-  - [ ] ItemIDRangeManager
+  - [x] ItemIDRangeManager
-  - [ ] Marriage
+  - [x] Marriage
   - [x] Monarch

src/db/src/ClientManager.cpp

@@ -23,7 +23,8 @@ extern int g_iItemCacheFlushSeconds;
 extern int g_test_server;
 extern std::string g_stLocale;
 extern std::string g_stLocaleNameColumn;
-bool CreateItemTableFromRes(MYSQL_RES *res, std::vector<TPlayerItem> *pVec, DWORD dwPID);
+
+bool CreateItemTableFromRes(pqxx::result *res, std::vector<TPlayerItem> *pVec, DWORD dwPID);
 
 DWORD g_dwUsageMax = 0;
 DWORD g_dwUsageAvg = 0;
@@ -248,10 +249,6 @@ bool CClientManager::Initialize()
 
 	LoadEventFlag();
 
-	// database character-set을 강제로 맞춤
-	if (g_stLocale == "big5" || g_stLocale == "sjis")
-		CDBManager::instance().QueryLocaleSet();
-
 	return true;
 }
 
@@ -262,17 +259,18 @@ void CClientManager::MainLoop()
 	SPDLOG_DEBUG("ClientManager pointer is {}", (void *)this);
 
 	// 메인루프
-	while (!m_bShutdowned)
+	// TODO Look at this
-	{
+	// while (!m_bShutdowned)
-		while ((tmp = CDBManager::instance().PopResult()))
+	// {
-		{
+	// 	while ((tmp = CDBManager::instance().PopResult()))
-			AnalyzeQueryResult(tmp);
+	// 	{
-			delete tmp;
+	// 		AnalyzeQueryResult(tmp);
-		}
+	// 		delete tmp;
+	// 	}
 
-		if (!Process())
+	// 	if (!Process())
-			break;
+	// 		break;
-	}
+	// }
 
 	//
 	// 메인루프 종료처리
@@ -527,24 +525,53 @@ void CClientManager::QUERY_QUEST_SAVE(CPeer *pkPeer, TQuestTable *pTable, DWORD
 
 	int iSize = dwLen / sizeof(TQuestTable);
 
-	char szQuery[1024];
+	// We move to prepared queries for speed and SAFETY
+	std::vector<TQuestTable> inserts;
+	std::vector<TQuestTable> deletes;
 
 	for (int i = 0; i < iSize; ++i, ++pTable)
 	{
 		if (pTable->lValue == 0)
-		{
+			deletes.push_back(*pTable);
-			snprintf(szQuery, sizeof(szQuery),
-					 "DELETE FROM quest%s WHERE dwPID=%d AND szName='%s' AND szState='%s'",
-					 GetTablePostfix(), pTable->dwPID, pTable->szName, pTable->szState);
-		}
 		else
+			inserts.push_back(*pTable);
+	}
+
+	auto pool = CDBManager::instance().GetConnectionPool();
+	auto conn = pool->acquire();
+
+	// Prepare statements
+	static bool prepared = false;
+	if (!prepared)
+	{
+		conn->prepare("delete_quest",
+					  "DELETE FROM player.quest WHERE player_id = $1 AND name = $2 AND state = $3");
+
+		conn->prepare("upsert_quest",
+					  "INSERT INTO player.quest (player_id, name, state, value) VALUES ($1, $2, $3, $4) ON CONFLICT (player_id, name, state) DO UPDATE SET value = EXCLUDED.value");
+
+		prepared = true;
+	}
+
+	try
+	{
+		pqxx::work txn{*conn};
+
+		for (const auto &row : deletes)
 		{
-			snprintf(szQuery, sizeof(szQuery),
+			txn.exec_prepared("delete_quest", row.dwPID, row.szName, row.szState);
-					 "REPLACE INTO quest%s (dwPID, szName, szState, lValue) VALUES(%d, '%s', '%s', %d)",
-					 GetTablePostfix(), pTable->dwPID, pTable->szName, pTable->szState, pTable->lValue);
 		}
 
-		CDBManager::instance().ReturnQuery(szQuery, QID_QUEST_SAVE, pkPeer->GetHandle(), NULL);
+		for (const auto &row : inserts)
+		{
+			txn.exec_prepared("upsert_quest", row.dwPID, row.szName, row.szState, row.lValue);
+		}
+
+		txn.commit();
+	}
+	catch (const std::exception &e)
+	{
+		SPDLOG_ERROR("[CClientManager::QUERY_QUEST_SAVE] Query error: {}", e.what());
 	}
 }
 
@@ -557,26 +584,30 @@ void CClientManager::QUERY_SAFEBOX_LOAD(CPeer *pkPeer, DWORD dwHandle, TSafeboxL
 	pi->ip[0] = bMall ? 1 : 0;
 	strlcpy(pi->login, packet->szLogin, sizeof(pi->login));
 
-	char szQuery[QUERY_MAX_LEN];
+	CDBManager::instance().AsyncQuery(
-	snprintf(szQuery, sizeof(szQuery),
+		"SELECT account_id, size, password FROM player.safebox WHERE account_id = $1",
-			 "SELECT account_id, size, password FROM safebox%s WHERE account_id=%u",
+		pqxx::params(packet->dwID),
-			 GetTablePostfix(), packet->dwID);
+		[this, pkPeer, pi](const pqxx::result &result, const std::string &error)
+		{
+			if (!error.empty())
+			{
+				return;
+			}
+
+			SPDLOG_DEBUG("QUERY_RESULT: HEADER_GD_SAFEBOX_LOAD");
+			CClientManager::RESULT_SAFEBOX_LOAD(pkPeer, pi, result);
+		});
 
 	SPDLOG_TRACE("HEADER_GD_SAFEBOX_LOAD (handle: {} account.id {} is_mall {})", dwHandle, packet->dwID, bMall ? 1 : 0);
-
-	CDBManager::instance().ReturnQuery(szQuery, QID_SAFEBOX_LOAD, pkPeer->GetHandle(), pi);
 }
 
-void CClientManager::RESULT_SAFEBOX_LOAD(CPeer *pkPeer, SQLMsg *msg)
+void CClientManager::RESULT_SAFEBOX_LOAD(CPeer *pkPeer, ClientHandleInfo *pi, pqxx::result msg)
 {
-	CQueryInfo *qi = (CQueryInfo *)msg->pvUserData;
-	ClientHandleInfo *pi = (ClientHandleInfo *)qi->pvData;
 	DWORD dwHandle = pi->dwHandle;
 
-	// 여기에서 사용하는 account_index는 쿼리 순서를 말한다.
+	// The account_index used here refers to the query order.
-	// 첫번째 패스워드 알아내기 위해 하는 쿼리가 0
+	// The first query to retrieve the password is 0.
-	// 두번째 실제 데이터를 얻어놓는 쿼리가 1
+	// The second query to fetch the actual data is 1.
-
 	if (pi->account_index == 0)
 	{
 		char szSafeboxPassword[SAFEBOX_PASSWORD_MAX_LEN + 1];
@@ -585,9 +616,7 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer *pkPeer, SQLMsg *msg)
 		TSafeboxTable *pSafebox = new TSafeboxTable;
 		memset(pSafebox, 0, sizeof(TSafeboxTable));
 
-		SQLResult *res = msg->Get();
+		if (msg.size() == 0)
-
-		if (res->uiNumRows == 0)
 		{
 			if (strcmp("000000", szSafeboxPassword))
 			{
@@ -598,32 +627,38 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer *pkPeer, SQLMsg *msg)
 		}
 		else
 		{
-			MYSQL_ROW row = mysql_fetch_row(res->pSQLResult);
+			pqxx::row row = msg[0];
+			// account_id, size, password
+			auto account_id = row[0].c_str();
+			auto size = row[1].c_str();
+			auto password = row[2].c_str();
 
-			// 비밀번호가 틀리면..
+			// If the password is incorrect...
-			if (((!row[2] || !*row[2]) && strcmp("000000", szSafeboxPassword)) ||
+			if (((!password || !*password) && strcmp("000000", szSafeboxPassword)) ||
-				((row[2] && *row[2]) && strcmp(row[2], szSafeboxPassword)))
+				((password && *password) && strcmp(password, szSafeboxPassword)))
 			{
 				pkPeer->EncodeHeader(HEADER_DG_SAFEBOX_WRONG_PASSWORD, dwHandle, 0);
 				delete pi;
 				return;
 			}
 
-			if (!row[0])
+			if (!account_id)
 				pSafebox->dwID = 0;
 			else
-				str_to_number(pSafebox->dwID, row[0]);
+				str_to_number(pSafebox->dwID, account_id);
 
-			if (!row[1])
+			if (!size)
 				pSafebox->bSize = 0;
 			else
-				str_to_number(pSafebox->bSize, row[1]);
+				str_to_number(pSafebox->bSize, size);
+
 			/*
-			   if (!row[3])
+			if (!row[3])
-			   pSafebox->dwGold = 0;
+			pSafebox->dwGold = 0;
-			   else
+			else
-			   pSafebox->dwGold = atoi(row[3]);
+			pSafebox->dwGold = atoi(row[3]);
-			   */
+			*/
+
 			if (pi->ip[0] == 1)
 			{
 				pSafebox->bSize = 1;
@@ -637,27 +672,32 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer *pkPeer, SQLMsg *msg)
 			pSafebox->dwID = pi->account_id;
 
 		pi->pSafebox = pSafebox;
-
-		char szQuery[512];
-		snprintf(szQuery, sizeof(szQuery),
-				 "SELECT id, window+0, pos, count, vnum, socket0, socket1, socket2, "
-				 "attrtype0, attrvalue0, "
-				 "attrtype1, attrvalue1, "
-				 "attrtype2, attrvalue2, "
-				 "attrtype3, attrvalue3, "
-				 "attrtype4, attrvalue4, "
-				 "attrtype5, attrvalue5, "
-				 "attrtype6, attrvalue6 "
-				 "FROM item%s WHERE owner_id=%d AND window='%s'",
-				 GetTablePostfix(), pi->account_id, pi->ip[0] == 0 ? "SAFEBOX" : "MALL");
-
 		pi->account_index = 1;
 
-		CDBManager::instance().ReturnQuery(szQuery, QID_SAFEBOX_LOAD, pkPeer->GetHandle(), pi);
+		CDBManager::instance().AsyncQuery(
+			"SELECT id, window_bits, position, count, vnum, socket_0, socket_1, socket_2, "
+			"attr_type_0, attr_value_0, "
+			"attr_type_1, attr_value_1, "
+			"attr_type_2, attr_value_2, "
+			"attr_type_3, attr_value_3, "
+			"attr_type_4, attr_value_4, "
+			"attr_type_5, attr_value_5, "
+			"attr_type_6, attr_value_6 "
+			"FROM player.item WHERE owner_id = $1 AND window = $2",
+			pqxx::params{pi->account_id, pi->ip[0] == 0 ? "SAFEBOX" : "MALL"},
+			[this, pkPeer, pi](const pqxx::result &result, const std::string &error)
+			{
+				if (!error.empty())
+				{
+					return;
+				}
+
+				SPDLOG_DEBUG("QUERY_RESULT: HEADER_GD_SAFEBOX_LOAD");
+				CClientManager::RESULT_SAFEBOX_LOAD(pkPeer, pi, result);
+			});
 	}
 	else
 	{
-
 		if (!pi->pSafebox)
 		{
 			SPDLOG_ERROR("null safebox pointer!");
@@ -665,9 +705,9 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer *pkPeer, SQLMsg *msg)
 			return;
 		}
 
-		// 쿼리에 에러가 있었으므로 응답할 경우 창고가 비어있는 것 처럼
+		// Since there was an error in the query, responding would make it look like the warehouse is empty,
-		// 보이기 때문에 창고가 아얘 안열리는게 나음
+		// so it's better not to open the warehouse at all.
-		if (!msg->Get()->pSQLResult)
+		if (msg.size() == 0)
 		{
 			SPDLOG_ERROR("null safebox result");
 			delete pi;
@@ -675,7 +715,7 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer *pkPeer, SQLMsg *msg)
 		}
 
 		static std::vector<TPlayerItem> s_items;
-		CreateItemTableFromRes(msg->Get()->pSQLResult, &s_items, pi->account_id);
+		CreateItemTableFromRes(&msg, &s_items, pi->account_id);
 
 		std::set<TItemAward *> *pSet = ItemAwardManager::instance().GetByLogin(pi->login);
 
@@ -707,7 +747,20 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer *pkPeer, SQLMsg *msg)
 
 				typeof(pSet->begin()) it = pSet->begin();
 
-				char szQuery[512];
+				auto pool = CDBManager::instance().GetConnectionPool();
+				auto conn = pool->acquire();
+
+				pqxx::work txn{*conn};
+
+				static bool prepared = false;
+				if (!prepared)
+				{
+					conn->prepare("result_safebox_load_insert_item",
+								  "INSERT INTO player.item (id, owner_id, window, position, vnum, count, socket_0, socket_1, socket_2) "
+								  "VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING id");
+
+					prepared = true;
+				}
 
 				while (it != pSet->end())
 				{
@@ -781,8 +834,8 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer *pkPeer, SQLMsg *msg)
 						case 72728:
 						case 72729:
 						case 72730:
-						// 무시무시하지만 이전에 하던 걸 고치기는 무섭고...
+						// It's terrifying, but fixing the old implementation is even scarier...
-						// 그래서 그냥 하드 코딩. 선물 상자용 자동물약 아이템들.
+						// So just hardcoding it. Auto potion items for gift boxes.
 						case 76004:
 						case 76005:
 						case 76021:
@@ -809,17 +862,20 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer *pkPeer, SQLMsg *msg)
 
 					{
 						itertype(m_map_itemTableByVnum) it = m_map_itemTableByVnum.find(dwItemVnum);
+
 						if (it == m_map_itemTableByVnum.end())
 						{
 							SPDLOG_ERROR("Invalid item(vnum : {}). It is not in m_map_itemTableByVnum.", dwItemVnum);
 							continue;
 						}
+
 						TItemTable *item_table = it->second;
 						if (item_table == NULL)
 						{
 							SPDLOG_ERROR("Invalid item_table (vnum : {}). It's value is NULL in m_map_itemTableByVnum.", dwItemVnum);
 							continue;
 						}
+
 						if (0 == pItemAward->dwSocket0)
 						{
 							for (int i = 0; i < ITEM_LIMIT_MAX_NUM; i++)
@@ -844,39 +900,45 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer *pkPeer, SQLMsg *msg)
 								}
 							}
 						}
-
-						snprintf(szQuery, sizeof(szQuery),
-								 "INSERT INTO item%s (id, owner_id, window, pos, vnum, count, socket0, socket1, socket2) "
-								 "VALUES(%u, %u, '%s', %d, %u, %u, %u, %u, %u)",
-								 GetTablePostfix(),
-								 GainItemID(),
-								 pi->account_id,
-								 pi->ip[0] == 0 ? "SAFEBOX" : "MALL",
-								 iPos,
-								 pItemAward->dwVnum, pItemAward->dwCount, pItemAward->dwSocket0, pItemAward->dwSocket1, dwSocket2);
 					}
 
-					std::unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
+					try
-					SQLResult *pRes = pmsg->Get();
+					{
-					SPDLOG_DEBUG("SAFEBOX Query : [{}]", szQuery);
+						pqxx::result res = txn.exec_prepared(
+							"result_safebox_load_insert_item",
+							GainItemID(),
+							pi->account_id,
+							pi->ip[0] == 0 ? "SAFEBOX" : "MALL",
+							iPos,
+							pItemAward->dwVnum, pItemAward->dwCount, pItemAward->dwSocket0, pItemAward->dwSocket1, dwSocket2);
 
-					if (pRes->uiAffectedRows == 0 || pRes->uiInsertID == 0 || pRes->uiAffectedRows == (uint32_t)-1)
+						SPDLOG_DEBUG("SAFEBOX Query");
-						break;
 
-					item.id = pmsg->Get()->uiInsertID;
+						if (res.size() == 0)
-					item.window = pi->ip[0] == 0 ? SAFEBOX : MALL,
+							break;
-					item.pos = iPos;
-					item.count = pItemAward->dwCount;
-					item.vnum = pItemAward->dwVnum;
-					item.alSockets[0] = pItemAward->dwSocket0;
-					item.alSockets[1] = pItemAward->dwSocket1;
-					item.alSockets[2] = dwSocket2;
-					s_items.push_back(item);
 
-					vec_dwFinishedAwardID.push_back(std::make_pair(pItemAward->dwID, item.id));
+						item.id = res[0][0].as<DWORD>();
-					grid.Put(iPos, 1, it->second->bSize);
+						item.window = pi->ip[0] == 0 ? SAFEBOX : MALL,
+						item.pos = iPos;
+						item.count = pItemAward->dwCount;
+						item.vnum = pItemAward->dwVnum;
+						item.alSockets[0] = pItemAward->dwSocket0;
+						item.alSockets[1] = pItemAward->dwSocket1;
+						item.alSockets[2] = dwSocket2;
+						s_items.push_back(item);
+
+						vec_dwFinishedAwardID.push_back(std::make_pair(pItemAward->dwID, item.id));
+						grid.Put(iPos, 1, it->second->bSize);
+					}
+					catch (const std::exception &e)
+					{
+						SPDLOG_ERROR("[CClientManager::RESULT_SAFEBOX_LOAD] Query error: {}", e.what());
+						continue;
+					}
 				}
 
+				txn.commit();
+
 				for (DWORD i = 0; i < vec_dwFinishedAwardID.size(); ++i)
 					ItemAwardManager::instance().Taken(vec_dwFinishedAwardID[i].first, vec_dwFinishedAwardID[i].second);
 			}
@@ -898,28 +960,30 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer *pkPeer, SQLMsg *msg)
 void CClientManager::QUERY_SAFEBOX_CHANGE_SIZE(CPeer *pkPeer, DWORD dwHandle, TSafeboxChangeSizePacket *p)
 {
 	ClientHandleInfo *pi = new ClientHandleInfo(dwHandle);
-	pi->account_index = p->bSize; // account_index를 사이즈로 임시로 사용
+	pi->account_index = p->bSize; // Temporarily use account_index as size
 
-	char szQuery[QUERY_MAX_LEN];
+	CDBManager::instance().AsyncQuery(
+		p->bSize == 1 ? "INSERT INTO player.safebox (size, account_id) VALUES($1, $2) RETURNING id" : "UPDATE player.safebox SET size = $1 WHERE account_id = $2 RETURNING id",
+		pqxx::params{p->bSize, p->dwID},
+		[this, pkPeer, pi](const pqxx::result &result, const std::string &error)
+		{
+			if (!error.empty())
+			{
+				return;
+			}
 
-	if (p->bSize == 1)
+			CClientManager::RESULT_SAFEBOX_CHANGE_SIZE(pkPeer, pi, result);
-		snprintf(szQuery, sizeof(szQuery), "INSERT INTO safebox%s (account_id, size) VALUES(%u, %u)", GetTablePostfix(), p->dwID, p->bSize);
+		});
-	else
-		snprintf(szQuery, sizeof(szQuery), "UPDATE safebox%s SET size=%u WHERE account_id=%u", GetTablePostfix(), p->bSize, p->dwID);
-
-	CDBManager::instance().ReturnQuery(szQuery, QID_SAFEBOX_CHANGE_SIZE, pkPeer->GetHandle(), pi);
 }
 
-void CClientManager::RESULT_SAFEBOX_CHANGE_SIZE(CPeer *pkPeer, SQLMsg *msg)
+void CClientManager::RESULT_SAFEBOX_CHANGE_SIZE(CPeer *pkPeer, ClientHandleInfo *pi, pqxx::result msg)
 {
-	CQueryInfo *qi = (CQueryInfo *)msg->pvUserData;
+	DWORD dwHandle = pi->dwHandle;
-	ClientHandleInfo *p = (ClientHandleInfo *)qi->pvData;
+	BYTE bSize = pi->account_index;
-	DWORD dwHandle = p->dwHandle;
-	BYTE bSize = p->account_index;
 
-	delete p;
+	delete pi;
 
-	if (msg->Get()->uiNumRows > 0)
+	if (msg.size() > 0)
 	{
 		pkPeer->EncodeHeader(HEADER_DG_SAFEBOX_CHANGE_SIZE, dwHandle, sizeof(BYTE));
 		pkPeer->EncodeBYTE(bSize);
@@ -933,48 +997,58 @@ void CClientManager::QUERY_SAFEBOX_CHANGE_PASSWORD(CPeer *pkPeer, DWORD dwHandle
 	strlcpy(pi->login, p->szOldPassword, sizeof(pi->login));
 	pi->account_id = p->dwID;
 
-	char szQuery[QUERY_MAX_LEN];
+	CDBManager::instance().AsyncQuery(
-	snprintf(szQuery, sizeof(szQuery), "SELECT password FROM safebox%s WHERE account_id=%u", GetTablePostfix(), p->dwID);
+		"SELECT password FROM player.safebox WHERE account_id = $1",
+		pqxx::params{p->dwID},
+		[this, pkPeer, pi](const pqxx::result &result, const std::string &error)
+		{
+			if (!error.empty())
+			{
+				return;
+			}
 
-	CDBManager::instance().ReturnQuery(szQuery, QID_SAFEBOX_CHANGE_PASSWORD, pkPeer->GetHandle(), pi);
+			CClientManager::RESULT_SAFEBOX_CHANGE_PASSWORD(pkPeer, pi, result);
+		});
 }
 
-void CClientManager::RESULT_SAFEBOX_CHANGE_PASSWORD(CPeer *pkPeer, SQLMsg *msg)
+void CClientManager::RESULT_SAFEBOX_CHANGE_PASSWORD(CPeer *pkPeer, ClientHandleInfo *pi, pqxx::result msg)
 {
-	CQueryInfo *qi = (CQueryInfo *)msg->pvUserData;
+	DWORD dwHandle = pi->dwHandle;
-	ClientHandleInfo *p = (ClientHandleInfo *)qi->pvData;
-	DWORD dwHandle = p->dwHandle;
 
-	if (msg->Get()->uiNumRows > 0)
+	if (msg.size() > 0)
 	{
-		MYSQL_ROW row = mysql_fetch_row(msg->Get()->pSQLResult);
+		auto password = msg[0][0].c_str();
 
-		if (row[0] && *row[0] && !strcasecmp(row[0], p->login) || (!row[0] || !*row[0]) && !strcmp("000000", p->login))
+		if (password && *password && !strcasecmp(password, pi->login) || (!password || !*password) && !strcmp("000000", pi->login))
 		{
-			char szQuery[QUERY_MAX_LEN];
+			CDBManager::instance().AsyncQuery(
-			char escape_pwd[64];
+				"UPDATE player.safebox SET password = $1 WHERE account_id = $2 RETURNING id",
-			CDBManager::instance().EscapeString(escape_pwd, p->safebox_password, strlen(p->safebox_password));
+				pqxx::params{pi->safebox_password, pi->account_id},
+				[this, pkPeer, pi](const pqxx::result &result, const std::string &error)
+				{
+					if (!error.empty())
+					{
+						return;
+					}
 
-			snprintf(szQuery, sizeof(szQuery), "UPDATE safebox%s SET password='%s' WHERE account_id=%u", GetTablePostfix(), escape_pwd, p->account_id);
+					CClientManager::RESULT_SAFEBOX_CHANGE_PASSWORD_SECOND(pkPeer, pi, result);
+				});
 
-			CDBManager::instance().ReturnQuery(szQuery, QID_SAFEBOX_CHANGE_PASSWORD_SECOND, pkPeer->GetHandle(), p);
 			return;
 		}
 	}
 
-	delete p;
+	delete pi;
 
 	// Wrong old password
 	pkPeer->EncodeHeader(HEADER_DG_SAFEBOX_CHANGE_PASSWORD_ANSWER, dwHandle, sizeof(BYTE));
 	pkPeer->EncodeBYTE(0);
 }
 
-void CClientManager::RESULT_SAFEBOX_CHANGE_PASSWORD_SECOND(CPeer *pkPeer, SQLMsg *msg)
+void CClientManager::RESULT_SAFEBOX_CHANGE_PASSWORD_SECOND(CPeer *pkPeer, ClientHandleInfo *pi, pqxx::result msg)
 {
-	CQueryInfo *qi = (CQueryInfo *)msg->pvUserData;
+	DWORD dwHandle = pi->dwHandle;
-	ClientHandleInfo *p = (ClientHandleInfo *)qi->pvData;
+	delete pi;
-	DWORD dwHandle = p->dwHandle;
-	delete p;
 
 	pkPeer->EncodeHeader(HEADER_DG_SAFEBOX_CHANGE_PASSWORD_ANSWER, dwHandle, sizeof(BYTE));
 	pkPeer->EncodeBYTE(1);
@@ -1364,13 +1438,13 @@ void CClientManager::QUERY_ITEM_SAVE(CPeer *pkPeer, const char *c_pData)
 
 		snprintf(szQuery, sizeof(szQuery),
 				 "REPLACE INTO item%s (id, owner_id, window, pos, count, vnum, socket0, socket1, socket2, "
-				 "attrtype0, attrvalue0, "
+				 "attr_type_0, attr_value_0, "
-				 "attrtype1, attrvalue1, "
+				 "attr_type_1, attr_value_1, "
-				 "attrtype2, attrvalue2, "
+				 "attr_type_2, attr_value_2, "
-				 "attrtype3, attrvalue3, "
+				 "attr_type_3, attr_value_3, "
-				 "attrtype4, attrvalue4, "
+				 "attr_type_4, attr_value_4, "
-				 "attrtype5, attrvalue5, "
+				 "attr_type_5, attr_value_5, "
-				 "attrtype6, attrvalue6) "
+				 "attr_type_6, attr_value_6) "
 				 "VALUES(%u, %u, %d, %d, %u, %u, %d, %d, %d, %hd, %hd, %hd, %hd, %hd, %hd, %hd, %hd, %hd, %hd, %hd, %hd, %hd, %hd)",
 				 GetTablePostfix(),
 				 p->id,

src/db/src/ClientManager.h

@@ -76,7 +76,7 @@ public:
 			pAccountTable = NULL;
 			player_id = dwPID;
 		};
-		// 독일선물기능용 생성자
+		// Constructor for the German gift feature
 		ClientHandleInfo(DWORD argHandle, DWORD dwPID, DWORD accountId)
 		{
 			dwHandle = argHandle;
@@ -247,10 +247,10 @@ private:
 
 	void QUERY_PLAYER_LOAD(CPeer *peer, DWORD dwHandle, TPlayerLoadPacket *);
 	void RESULT_COMPOSITE_PLAYER(CPeer *peer, SQLMsg *pMsg, DWORD dwQID);
-	void RESULT_PLAYER_LOAD(CPeer *peer, MYSQL_RES *pRes, ClientHandleInfo *pkInfo);
+	void RESULT_PLAYER_LOAD(CPeer *peer, pqxx::result *pRes, ClientHandleInfo *pkInfo);
-	void RESULT_ITEM_LOAD(CPeer *peer, MYSQL_RES *pRes, DWORD dwHandle, DWORD dwPID);
+	void RESULT_ITEM_LOAD(CPeer *peer, pqxx::result *pRes, DWORD dwHandle, DWORD dwPID);
-	void RESULT_QUEST_LOAD(CPeer *pkPeer, MYSQL_RES *pRes, DWORD dwHandle, DWORD dwPID);
+	void RESULT_QUEST_LOAD(CPeer *pkPeer, pqxx::result *pRes, DWORD dwHandle, DWORD dwPID);
-	void RESULT_AFFECT_LOAD(CPeer *pkPeer, MYSQL_RES *pRes, DWORD dwHandle);
+	void RESULT_AFFECT_LOAD(CPeer *pkPeer, pqxx::result *pRes, DWORD dwHandle);
 
 	// PLAYER_INDEX_CREATE_BUG_FIX
 	void RESULT_PLAYER_INDEX_CREATE(CPeer *pkPeer, SQLMsg *msg);
@@ -296,10 +296,10 @@ private:
 	void QUERY_SAFEBOX_CHANGE_SIZE(CPeer *pkPeer, DWORD dwHandle, TSafeboxChangeSizePacket *p);
 	void QUERY_SAFEBOX_CHANGE_PASSWORD(CPeer *pkPeer, DWORD dwHandle, TSafeboxChangePasswordPacket *p);
 
-	void RESULT_SAFEBOX_LOAD(CPeer *pkPeer, SQLMsg *msg);
+	void RESULT_SAFEBOX_LOAD(CPeer *pkPeer, ClientHandleInfo *pi, pqxx::result msg);
-	void RESULT_SAFEBOX_CHANGE_SIZE(CPeer *pkPeer, SQLMsg *msg);
+	void RESULT_SAFEBOX_CHANGE_SIZE(CPeer *pkPeer, ClientHandleInfo *pi, pqxx::result msg);
-	void RESULT_SAFEBOX_CHANGE_PASSWORD(CPeer *pkPeer, SQLMsg *msg);
+	void RESULT_SAFEBOX_CHANGE_PASSWORD(CPeer *pkPeer, ClientHandleInfo *pi, pqxx::result msg);
-	void RESULT_SAFEBOX_CHANGE_PASSWORD_SECOND(CPeer *pkPeer, SQLMsg *msg);
+	void RESULT_SAFEBOX_CHANGE_PASSWORD_SECOND(CPeer *pkPeer, ClientHandleInfo *pi, pqxx::result msg);
 
 	void QUERY_EMPIRE_SELECT(CPeer *pkPeer, DWORD dwHandle, TEmpireSelectPacket *p);
 	void QUERY_SETUP(CPeer *pkPeer, DWORD dwHandle, const char *c_pData);
@@ -318,7 +318,7 @@ private:
 	void QUERY_RELOAD_PROTO();
 
 	void QUERY_CHANGE_NAME(CPeer *peer, DWORD dwHandle, TPacketGDChangeName *p);
-	void GetPlayerFromRes(TPlayerTable *player_table, MYSQL_RES *res);
+	void GetPlayerFromRes(TPlayerTable *player_table, pqxx::result *res);
 
 	void QUERY_LOGIN_KEY(CPeer *pkPeer, TPacketGDLoginKey *p);
 

src/db/src/ClientManagerPlayer.cpp

@@ -18,7 +18,8 @@ extern int g_test_server;
 //
 // Check all SELECT syntax on item table before change this function!!!
 //
-bool CreateItemTableFromRes(MYSQL_RES *res, std::vector<TPlayerItem> *pVec, DWORD dwPID)
+// TODO Finish moving this to pg
+bool CreateItemTableFromRes(pqxx::result *res, std::vector<TPlayerItem> *pVec, DWORD dwPID)
 {
 	if (!res)
 	{

src/db/src/DBManager.cpp

@@ -84,6 +84,18 @@ void CDBManager::AsyncQuery(const std::string &query, const pqxx::params &params
 	m_queueCondition.notify_one();
 }
 
+void CDBManager::AsyncQuery(const std::string &query, const pqxx::params &params, AsyncQueryCallback callback)
+{
+	auto msg = std::make_shared<PgAsyncQuery>(++m_msgCounter, query, params, std::move(callback));
+
+	{
+		std::lock_guard<std::mutex> lock(m_queueMutex);
+		m_queryQueue.push(msg);
+	}
+
+	m_queueCondition.notify_one();
+}
+
 size_t CDBManager::GetPendingQueryCount() const
 {
 	std::lock_guard<std::mutex> lock(m_queueMutex);
@@ -156,6 +168,9 @@ void CDBManager::WorkerLoop()
 
 void CDBManager::ProcessQuery(std::shared_ptr<PgAsyncQuery> msg)
 {
+	pqxx::result result;
+	std::string error;
+
 	try
 	{
 		if (!m_connPool)
@@ -170,7 +185,7 @@ void CDBManager::ProcessQuery(std::shared_ptr<PgAsyncQuery> msg)
 		}
 
 		pqxx::work txn(*conn);
-		txn.exec_params(msg->query, msg->parameters);
+		result = txn.exec_params(msg->query, msg->parameters);
 		txn.commit();
 
 		SPDLOG_TRACE("AsyncQuery completed: {} (ID: {})", msg->query, msg->id);
@@ -180,5 +195,17 @@ void CDBManager::ProcessQuery(std::shared_ptr<PgAsyncQuery> msg)
 		SPDLOG_ERROR("AsyncQuery failed: {} (query: {}, ID: {})", e.what(), msg->query, msg->id);
 	}
 
+	if (msg->hasCallback && msg->callback)
+	{
+		try
+		{
+			msg->callback(result, error);
+		}
+		catch (const std::exception &e)
+		{
+			SPDLOG_ERROR("AsyncQuery callback threw exception: {}", e.what());
+		}
+	}
+
 	++m_completedQueries;
-}
+}

src/db/src/DBManager.h

@@ -20,6 +20,7 @@ public:
 	// Async Query
 
 	void AsyncQuery(const std::string &query, const pqxx::params &params = pqxx::params{});
+	void AsyncQuery(const std::string &query, const pqxx::params &params, AsyncQueryCallback callback);
 
 	size_t GetPendingQueryCount() const;
 	size_t GetCompletedQueryCount() const;

src/db/src/GuildManager.cpp

@@ -140,23 +140,21 @@ TGuild &CGuildManager::TouchGuild(DWORD GID)
 	return m_map_kGuild[GID];
 }
 
-void CGuildManager::ParseResult(SQLResult *pRes)
+void CGuildManager::ParseResult(pqxx::result result)
 {
-	MYSQL_ROW row;
+	for (auto row : result)
-
-	while ((row = mysql_fetch_row(pRes->pSQLResult)))
 	{
-		DWORD GID = strtoul(row[0], NULL, 10);
+		DWORD GID = strtoul(row[0].c_str(), NULL, 10);
 
 		TGuild &r_info = TouchGuild(GID);
 
-		strlcpy(r_info.szName, row[1], sizeof(r_info.szName));
+		strlcpy(r_info.szName, row[1].c_str(), sizeof(r_info.szName));
-		str_to_number(r_info.ladder_point, row[2]);
+		str_to_number(r_info.ladder_point, row[2].c_str());
-		str_to_number(r_info.win, row[3]);
+		str_to_number(r_info.win, row[3].c_str());
-		str_to_number(r_info.draw, row[4]);
+		str_to_number(r_info.draw, row[4].c_str());
-		str_to_number(r_info.loss, row[5]);
+		str_to_number(r_info.loss, row[5].c_str());
-		str_to_number(r_info.gold, row[6]);
+		str_to_number(r_info.gold, row[6].c_str());
-		str_to_number(r_info.level, row[7]);
+		str_to_number(r_info.level, row[7].c_str());
 
 		SPDLOG_DEBUG(
 			"GuildWar: {:24} ladder {:<5} win {:<3} draw {:<3} loss {:<3}",
@@ -170,12 +168,25 @@ void CGuildManager::ParseResult(SQLResult *pRes)
 
 void CGuildManager::Initialize()
 {
-	char szQuery[1024];
+	auto pool = CDBManager::instance().GetConnectionPool();
-	snprintf(szQuery, sizeof(szQuery), "SELECT id, name, ladder_point, win, draw, loss, gold, level FROM guild%s", GetTablePostfix());
+	auto conn = pool->acquire();
-	std::unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
 
-	if (pmsg->Get()->uiNumRows)
+	try
-		ParseResult(pmsg->Get());
+	{
+		pqxx::work txn{*conn};
+		pqxx::result result = txn.exec("SELECT id, name, ladder_point, win, draw, loss, gold, level FROM player.guild");
+		std::size_t const numRows = std::size(result);
+
+		if (result.size())
+			ParseResult(result);
+
+		txn.commit();
+	}
+	catch (const std::exception &e)
+	{
+		SPDLOG_ERROR("[CMonarch::LoadMonarch] Query error: {}", e.what());
+		return;
+	}
 
 	char str[128 + 1];
 
@@ -200,21 +211,39 @@ void CGuildManager::Initialize()
 
 void CGuildManager::Load(DWORD dwGuildID)
 {
-	char szQuery[1024];
+	auto pool = CDBManager::instance().GetConnectionPool();
+	auto conn = pool->acquire();
 
-	snprintf(szQuery, sizeof(szQuery), "SELECT id, name, ladder_point, win, draw, loss, gold, level FROM guild%s WHERE id=%u", GetTablePostfix(), dwGuildID);
+	try
-	std::unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
+	{
+		pqxx::work txn{*conn};
+		pqxx::result result = txn.exec_params("SELECT id, name, ladder_point, win, draw, loss, gold, level FROM player.guild WHERE id=$1", pqxx::params{dwGuildID});
+		std::size_t const numRows = std::size(result);
 
-	if (pmsg->Get()->uiNumRows)
+		if (result.size())
-		ParseResult(pmsg->Get());
+			ParseResult(result);
+
+		txn.commit();
+	}
+	catch (const std::exception &e)
+	{
+		SPDLOG_ERROR("[CMonarch::LoadMonarch] Query error: {}", e.what());
+		return;
+	}
 }
 
 void CGuildManager::QueryRanking()
 {
-	char szQuery[256];
+	CDBManager::instance().AsyncQuery("SELECT id, name, ladder_point FROM player.guild ORDER BY ladder_point DESC LIMIT 20", pqxx::params{},
-	snprintf(szQuery, sizeof(szQuery), "SELECT id,name,ladder_point FROM guild%s ORDER BY ladder_point DESC LIMIT 20", GetTablePostfix());
+									  [this](const pqxx::result &result, const std::string &error)
+									  {
+										  if (!error.empty())
+										  {
+											  return;
+										  }
 
-	CDBManager::instance().ReturnQuery(szQuery, QID_GUILD_RANKING, 0, 0);
+										  CGuildManager::ResultRanking(result);
+									  });
 }
 
 int CGuildManager::GetRanking(DWORD dwGID)
@@ -227,24 +256,19 @@ int CGuildManager::GetRanking(DWORD dwGID)
 	return std::clamp(it->second, 0, GUILD_RANK_MAX_NUM);
 }
 
-void CGuildManager::ResultRanking(MYSQL_RES *pRes)
+void CGuildManager::ResultRanking(pqxx::result result)
 {
-	if (!pRes)
-		return;
-
 	int iLastLadderPoint = -1;
 	int iRank = 0;
 
 	map_kLadderPointRankingByGID.clear();
 
-	MYSQL_ROW row;
+	for (auto row : result)
-
-	while ((row = mysql_fetch_row(pRes)))
 	{
 		DWORD dwGID = 0;
-		str_to_number(dwGID, row[0]);
+		str_to_number(dwGID, row[0].c_str());
 		int iLadderPoint = 0;
-		str_to_number(iLadderPoint, row[2]);
+		str_to_number(iLadderPoint, row[2].c_str());
 
 		if (iLadderPoint != iLastLadderPoint)
 			++iRank;
@@ -970,36 +994,50 @@ void CGuildManager::BootReserveWar()
 
 int GetAverageGuildMemberLevel(DWORD dwGID)
 {
-	char szQuery[QUERY_MAX_LEN];
+	auto pool = CDBManager::instance().GetConnectionPool();
+	auto conn = pool->acquire();
 
-	snprintf(szQuery, sizeof(szQuery),
+	try
-			 "SELECT AVG(level) FROM guild_member%s, player%s AS p WHERE guild_id=%u AND guild_member%s.pid=p.id",
+	{
-			 GetTablePostfix(), GetTablePostfix(), dwGID, GetTablePostfix());
+		pqxx::work txn{*conn};
+		pqxx::row row = txn.exec_params1("SELECT AVG(level) FROM player.guild_member, player.player AS p WHERE guild_id=$1 AND player.guild_member.pid=p.id", pqxx::params{dwGID});
 
-	std::unique_ptr<SQLMsg> msg(CDBManager::instance().DirectQuery(szQuery));
+		int nAverageLevel = 0;
+		str_to_number(nAverageLevel, row[0].c_str());
 
-	MYSQL_ROW row;
+		txn.commit();
-	row = mysql_fetch_row(msg->Get()->pSQLResult);
 
-	int nAverageLevel = 0;
+		return nAverageLevel;
-	str_to_number(nAverageLevel, row[0]);
+	}
-	return nAverageLevel;
+	catch (const std::exception &e)
+	{
+		SPDLOG_ERROR("[CMonarch::LoadMonarch] Query error: {}", e.what());
+		return;
+	}
 }
 
 int GetGuildMemberCount(DWORD dwGID)
 {
-	char szQuery[QUERY_MAX_LEN];
+	auto pool = CDBManager::instance().GetConnectionPool();
+	auto conn = pool->acquire();
 
-	snprintf(szQuery, sizeof(szQuery), "SELECT COUNT(*) FROM guild_member%s WHERE guild_id=%u", GetTablePostfix(), dwGID);
+	try
+	{
+		pqxx::work txn{*conn};
+		pqxx::row row = txn.exec_params1("SELECT COUNT(*) FROM player.guild_member WHERE guild_id=$1", pqxx::params{dwGID});
 
-	std::unique_ptr<SQLMsg> msg(CDBManager::instance().DirectQuery(szQuery));
+		DWORD dwCount = 0;
+		str_to_number(dwCount, row[0].c_str());
 
-	MYSQL_ROW row;
+		txn.commit();
-	row = mysql_fetch_row(msg->Get()->pSQLResult);
 
-	DWORD dwCount = 0;
+		return dwCount;
-	str_to_number(dwCount, row[0]);
+	}
-	return dwCount;
+	catch (const std::exception &e)
+	{
+		SPDLOG_ERROR("[CMonarch::LoadMonarch] Query error: {}", e.what());
+		return;
+	}
 }
 
 bool CGuildManager::ReserveWar(TPacketGuildWar *p)
@@ -1029,7 +1067,7 @@ bool CGuildManager::ReserveWar(TPacketGuildWar *p)
 	// 파워 계산
 	TGuild &k1 = TouchGuild(GID1);
 
-	lvp = c_aiScoreByLevel[std::min<size_t>(GUILD_MAX_LEVEL, k1.level)];
+	lvp = c_aiScoreByLevel[std::min<std::size_t>(GUILD_MAX_LEVEL, k1.level)];
 	rkp = c_aiScoreByRanking[GetRanking(GID1)];
 	alv = GetAverageGuildMemberLevel(GID1);
 	mc = GetGuildMemberCount(GID1);
@@ -1045,7 +1083,7 @@ bool CGuildManager::ReserveWar(TPacketGuildWar *p)
 	// 파워 계산
 	TGuild &k2 = TouchGuild(GID2);
 
-	lvp = c_aiScoreByLevel[std::min<size_t>(GUILD_MAX_LEVEL, k2.level)];
+	lvp = c_aiScoreByLevel[std::min<std::size_t>(GUILD_MAX_LEVEL, k2.level)];
 	rkp = c_aiScoreByRanking[GetRanking(GID2)];
 	alv = GetAverageGuildMemberLevel(GID2);
 	mc = GetGuildMemberCount(GID2);
@@ -1074,27 +1112,37 @@ bool CGuildManager::ReserveWar(TPacketGuildWar *p)
 	SPDLOG_DEBUG("GuildWar: handicap {}", t.lHandicap);
 
 	// 쿼리
-	char szQuery[512];
+	auto pool = CDBManager::instance().GetConnectionPool();
+	auto conn = pool->acquire();
 
-	snprintf(szQuery, sizeof(szQuery),
+	try
-			 "INSERT INTO guild_war_reservation (guild1, guild2, time, type, warprice, initscore, power1, power2, handicap) "
-			 "VALUES(%u, %u, DATE_ADD(NOW(), INTERVAL 180 SECOND), %u, %d, %d, %d, %d, %d)",
-			 GID1, GID2, p->bType, p->lWarPrice, p->lInitialScore, t.lPowerFrom, t.lPowerTo, t.lHandicap);
-
-	std::unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
-
-	if (pmsg->Get()->uiAffectedRows == 0 || pmsg->Get()->uiInsertID == 0 || pmsg->Get()->uiAffectedRows == (uint32_t)-1)
 	{
-		SPDLOG_ERROR("GuildWar: Cannot insert row");
+		pqxx::work txn{*conn};
-		return false;
+		pqxx::result result = txn.exec_params(
+			"INSERT INTO player.guild_war_reservation (guild1, guild2, time, type, warprice, initscore, power1, power2, handicap) "
+			"VALUES($1, $2, DATE_ADD(NOW(), INTERVAL 180 SECOND), $3, $4, $5, $6, $7, $8) RETURNING id",
+			pqxx::params{GID1, GID2, p->bType, p->lWarPrice, p->lInitialScore, t.lPowerFrom, t.lPowerTo, t.lHandicap});
+
+		txn.commit();
+
+		if (result.size() == 0)
+		{
+			SPDLOG_ERROR("GuildWar: Cannot insert row");
+			return false;
+		}
+
+		t.dwID = result.at(0)[0].as<DWORD>();
+
+		m_map_kWarReserve.insert(std::make_pair(t.dwID, new CGuildWarReserve(t)));
+
+		CClientManager::instance().ForwardPacket(HEADER_DG_GUILD_WAR_RESERVE_ADD, &t, sizeof(TGuildWarReserve));
+		return true;
+	}
+	catch (const std::exception &e)
+	{
+		SPDLOG_ERROR("[CMonarch::LoadMonarch] Query error: {}", e.what());
+		false;
 	}
-
-	t.dwID = pmsg->Get()->uiInsertID;
-
-	m_map_kWarReserve.insert(std::make_pair(t.dwID, new CGuildWarReserve(t)));
-
-	CClientManager::instance().ForwardPacket(HEADER_DG_GUILD_WAR_RESERVE_ADD, &t, sizeof(TGuildWarReserve));
-	return true;
 }
 
 void CGuildManager::ProcessReserveWar()

src/db/src/GuildManager.h

@@ -199,7 +199,7 @@ public:
 	void MoneyChange(DWORD dwGuild, DWORD dwGold);
 
 	void QueryRanking();
-	void ResultRanking(MYSQL_RES *pRes);
+	void ResultRanking(pqxx::result pRes);
 	int GetRanking(DWORD dwGID);
 
 	//
@@ -215,7 +215,7 @@ public:
 	bool ChangeMaster(DWORD dwGID, DWORD dwFrom, DWORD dwTo);
 
 private:
-	void ParseResult(SQLResult *pRes);
+	void ParseResult(pqxx::result pRes);
 
 	void RemoveWar(DWORD GID1, DWORD GID2); // erase war from m_WarMap and set end on priority queue
 

src/db/src/ItemIDRangeManager.cpp

@@ -84,71 +84,59 @@ TItemIDRangeTable CItemIDRangeManager::GetRange()
 
 	return ret;
 }
+#include <pqxx/pqxx>
+#include <spdlog/spdlog.h>
 
 bool CItemIDRangeManager::BuildRange(DWORD dwMin, DWORD dwMax, TItemIDRangeTable &range)
 {
-	char szQuery[1024];
 	DWORD dwItemMaxID = 0;
-	SQLMsg *pMsg = NULL;
-	MYSQL_ROW row;
 
-	snprintf(szQuery, sizeof(szQuery), "SELECT MAX(id) FROM item%s WHERE id >= %u and id <= %u", GetTablePostfix(), dwMin, dwMax);
+	auto pool = CDBManager::instance().GetConnectionPool();
+	auto conn = pool->acquire();
 
-	pMsg = CDBManager::instance().DirectQuery(szQuery);
+	try
-
-	if (pMsg != NULL)
 	{
-		if (pMsg->Get()->uiNumRows > 0)
+		pqxx::work txn(*conn);
+
+		auto maxRow = txn.exec_params1("SELECT MAX(id) FROM item WHERE id >= $1 AND id <= $2", dwMin, dwMax);
+
+		if (!maxRow[0].is_null())
+			dwItemMaxID = maxRow[0].as<DWORD>();
+
+		dwItemMaxID = (dwItemMaxID == 0) ? dwMin : dwItemMaxID + 1;
+
+		if ((dwMax < dwItemMaxID) || (dwMax - dwItemMaxID < cs_dwMinimumRemainCount))
 		{
-			row = mysql_fetch_row(pMsg->Get()->pSQLResult);
+			SPDLOG_DEBUG("ItemIDRange: Build {} ~ {} start: {}\tNOT USE remain count is below {}",
-			str_to_number(dwItemMaxID, row[0]);
+						 dwMin, dwMax, dwItemMaxID, cs_dwMinimumRemainCount);
 		}
-		delete pMsg;
+		else
-	}
-
-	if (dwItemMaxID == 0)
-		dwItemMaxID = dwMin;
-	else
-		dwItemMaxID++;
-
-	if ((dwMax < dwItemMaxID) || (dwMax - dwItemMaxID < cs_dwMinimumRemainCount))
-	{
-		SPDLOG_DEBUG("ItemIDRange: Build {} ~ {} start: {}\tNOT USE remain count is below {}",
-					 dwMin, dwMax, dwItemMaxID, cs_dwMinimumRemainCount);
-	}
-	else
-	{
-		range.dwMin = dwMin;
-		range.dwMax = dwMax;
-		range.dwUsableItemIDMin = dwItemMaxID;
-
-		snprintf(szQuery, sizeof(szQuery), "SELECT COUNT(*) FROM item%s WHERE id >= %u AND id <= %u",
-				 GetTablePostfix(), range.dwUsableItemIDMin, range.dwMax);
-
-		pMsg = CDBManager::instance().DirectQuery(szQuery);
-
-		if (pMsg != NULL)
 		{
-			if (pMsg->Get()->uiNumRows > 0)
+			range.dwMin = dwMin;
+			range.dwMax = dwMax;
+			range.dwUsableItemIDMin = dwItemMaxID;
+
+			auto countRow = txn.exec_params1("SELECT COUNT(*) FROM item WHERE id >= $1 AND id <= $2", range.dwUsableItemIDMin, range.dwMax);
+
+			DWORD count = countRow[0].as<DWORD>();
+
+			if (count > 0)
 			{
-				DWORD count = 0;
+				SPDLOG_ERROR("ItemIDRange: Build: {} ~ {}\thave a item", range.dwUsableItemIDMin, range.dwMax);
-				row = mysql_fetch_row(pMsg->Get()->pSQLResult);
+				return false;
-				str_to_number(count, row[0]);
+			}
-
+			else
-				if (count > 0)
+			{
-				{
+				SPDLOG_TRACE("ItemIDRange: Build: {} ~ {} start:{}", range.dwMin, range.dwMax, range.dwUsableItemIDMin);
-					SPDLOG_ERROR("ItemIDRange: Build: {} ~ {}\thave a item", range.dwUsableItemIDMin, range.dwMax);
+				return true;
-					return false;
-				}
-				else
-				{
-					SPDLOG_TRACE("ItemIDRange: Build: {} ~ {} start:{}", range.dwMin, range.dwMax, range.dwUsableItemIDMin);
-					return true;
-				}
 			}
-
-			delete pMsg;
 		}
+
+		txn.commit();
+	}
+	catch (const std::exception &e)
+	{
+		SPDLOG_ERROR("[CItemIDRangeManager::BuildRange] Query error: {}", e.what());
 	}
 
 	return false;

src/db/src/Marriage.cpp

@@ -34,36 +34,32 @@ namespace marriage
 
 	bool CManager::Initialize()
 	{
-		char szQuery[1024];
+		auto pool = CDBManager::instance().GetConnectionPool();
+		auto conn = pool->acquire();
 
-		snprintf(szQuery, sizeof(szQuery),
+		try
-				 "SELECT pid1, pid2, love_point, time, is_married, p1.name, p2.name FROM marriage, player%s as p1, player%s as p2 WHERE p1.id = pid1 AND p2.id = pid2",
-				 GetTablePostfix(), GetTablePostfix());
-
-		unique_ptr<SQLMsg> pmsg_delete(CDBManager::instance().DirectQuery("DELETE FROM marriage WHERE is_married = 0"));
-		unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
-
-		SQLResult *pRes = pmsg->Get();
-		SPDLOG_DEBUG("MarriageList(size={})", pRes->uiNumRows);
-
-		if (pRes->uiNumRows > 0)
 		{
-			for (uint uiRow = 0; uiRow != pRes->uiNumRows; ++uiRow)
+			pqxx::work txn{*conn};
-			{
+			txn.exec("DELETE FROM player.marriage WHERE is_married = false");
-				MYSQL_ROW row = mysql_fetch_row(pRes->pSQLResult);
+			pqxx::result result = txn.exec("SELECT player_id_1, player_id_2, love_points, created_at, is_married, p1.name, p2.name FROM player.marriage, player.player as p1, player.player as p2 WHERE p1.id = player_id_1 AND p2.id = player_id_2");
 
+			std::size_t const numRows = std::size(result);
+			SPDLOG_DEBUG("MarriageList(size={})", numRows);
+
+			for (auto row : result)
+			{
 				DWORD pid1 = 0;
-				str_to_number(pid1, row[0]);
+				str_to_number(pid1, row[0].c_str());
 				DWORD pid2 = 0;
-				str_to_number(pid2, row[1]);
+				str_to_number(pid2, row[1].c_str());
 				int love_point = 0;
-				str_to_number(love_point, row[2]);
+				str_to_number(love_point, row[2].c_str());
 				DWORD time = 0;
-				str_to_number(time, row[3]);
+				str_to_number(time, row[3].c_str());
 				BYTE is_married = 0;
-				str_to_number(is_married, row[4]);
+				str_to_number(is_married, row[4].c_str());
-				const char *name1 = row[5];
+				const char *name1 = row[5].c_str();
-				const char *name2 = row[6];
+				const char *name2 = row[6].c_str();
 
 				TMarriage *pMarriage = new TMarriage(pid1, pid2, love_point, time, is_married, name1, name2);
 				m_Marriages.insert(pMarriage);
@@ -72,7 +68,15 @@ namespace marriage
 
 				SPDLOG_DEBUG("Marriage {}: LP:{} TM:{} ST:{} {:10}:{:16} {:10}:{:16} ", uiRow, love_point, time, is_married, pid1, name1, pid2, name2);
 			}
+
+			txn.commit();
 		}
+		catch (const std::exception &e)
+		{
+			SPDLOG_ERROR("[CManager::Initialize] Query error: {}", e.what());
+			return false;
+		}
+
 		return true;
 	}
 
@@ -103,15 +107,26 @@ namespace marriage
 
 		Align(dwPID1, dwPID2);
 
-		char szQuery[512];
+		auto pool = CDBManager::instance().GetConnectionPool();
-		snprintf(szQuery, sizeof(szQuery), "INSERT INTO marriage(pid1, pid2, love_point, time) VALUES (%u, %u, 0, %u)", dwPID1, dwPID2, now);
+		auto conn = pool->acquire();
 
-		unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
+		try
-
-		SQLResult *res = pmsg->Get();
-		if (res->uiAffectedRows == 0 || res->uiAffectedRows == (uint32_t)-1)
 		{
-			SPDLOG_ERROR("cannot insert marriage");
+			pqxx::work txn{*conn};
+			pqxx::result result = txn.exec_params("INSERT INTO player.marriage(player_id_1, player_id_2, love_points, created_at) VALUES ($1, $2, 0, $3) RETURNING id", dwPID1, dwPID2, now);
+			std::size_t const numRows = std::size(result);
+
+			if (numRows == 0)
+			{
+				SPDLOG_ERROR("cannot insert marriage");
+				return;
+			}
+
+			txn.commit();
+		}
+		catch (const std::exception &e)
+		{
+			SPDLOG_ERROR("[CManager::Add] Query error: {}", e.what());
 			return;
 		}
 
@@ -142,16 +157,26 @@ namespace marriage
 
 		Align(dwPID1, dwPID2);
 
-		char szQuery[512];
+		auto pool = CDBManager::instance().GetConnectionPool();
-		snprintf(szQuery, sizeof(szQuery), "UPDATE marriage SET love_point = %d, is_married = %d WHERE pid1 = %u AND pid2 = %u",
+		auto conn = pool->acquire();
-				 iLovePoint, byMarried, pMarriage->pid1, pMarriage->pid2);
 
-		unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
+		try
-
-		SQLResult *res = pmsg->Get();
-		if (res->uiAffectedRows == 0 || res->uiAffectedRows == (uint32_t)-1)
 		{
-			SPDLOG_ERROR("cannot update marriage : PID:{} {}", dwPID1, dwPID2);
+			pqxx::work txn{*conn};
+			pqxx::result result = txn.exec_params("UPDATE player.marriage SET love_points=$1, is_married=$2 WHERE player_id_1=$3 AND player_id_2=$4 RETURNING id", iLovePoint, byMarried, pMarriage->pid1, pMarriage->pid2);
+			std::size_t const numRows = std::size(result);
+
+			if (numRows == 0)
+			{
+				SPDLOG_ERROR("cannot update marriage : PID:{} {}", dwPID1, dwPID2);
+				return;
+			}
+
+			txn.commit();
+		}
+		catch (const std::exception &e)
+		{
+			SPDLOG_ERROR("[CManager::Update] Query error: {}", e.what());
 			return;
 		}
 
@@ -189,15 +214,26 @@ namespace marriage
 
 		Align(dwPID1, dwPID2);
 
-		char szQuery[512];
+		auto pool = CDBManager::instance().GetConnectionPool();
-		snprintf(szQuery, sizeof(szQuery), "DELETE FROM marriage WHERE pid1 = %u AND pid2 = %u", dwPID1, dwPID2);
+		auto conn = pool->acquire();
 
-		unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
+		try
-
-		SQLResult *res = pmsg->Get();
-		if (res->uiAffectedRows == 0 || res->uiAffectedRows == (uint32_t)-1)
 		{
-			SPDLOG_ERROR("cannot delete marriage : PID:{} {}", dwPID1, dwPID2);
+			pqxx::work txn{*conn};
+			pqxx::result result = txn.exec_params("DELETE FROM player.marriage WHERE player_id_1=$1 AND player_id_2=$2", dwPID1, dwPID2);
+			std::size_t const numRows = std::size(result);
+
+			if (numRows == 0)
+			{
+				SPDLOG_ERROR("cannot delete marriage : PID:{} {}", dwPID1, dwPID2);
+				return;
+			}
+
+			txn.commit();
+		}
+		catch (const std::exception &e)
+		{
+			SPDLOG_ERROR("[CManager::Remove] Query error: {}", e.what());
 			return;
 		}
 
@@ -232,16 +268,26 @@ namespace marriage
 
 		Align(dwPID1, dwPID2);
 
-		char szQuery[512];
+		auto pool = CDBManager::instance().GetConnectionPool();
-		snprintf(szQuery, sizeof(szQuery), "UPDATE marriage SET is_married = 1 WHERE pid1 = %u AND pid2 = %u",
+		auto conn = pool->acquire();
-				 pMarriage->pid1, pMarriage->pid2);
 
-		unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
+		try
-
-		SQLResult *res = pmsg->Get();
-		if (res->uiAffectedRows == 0 || res->uiAffectedRows == (uint32_t)-1)
 		{
-			SPDLOG_ERROR("cannot change engage to marriage : PID:{} {}", dwPID1, dwPID2);
+			pqxx::work txn{*conn};
+			pqxx::result result = txn.exec_params("UPDATE player.marriage SET is_married = 1 WHERE player_id_1=$1 AND player_id_2=$2", pMarriage->pid1, pMarriage->pid2);
+			std::size_t const numRows = std::size(result);
+
+			if (numRows == 0)
+			{
+				SPDLOG_ERROR("cannot change engage to marriage : PID:{} {}", dwPID1, dwPID2);
+				return;
+			}
+
+			txn.commit();
+		}
+		catch (const std::exception &e)
+		{
+			SPDLOG_ERROR("[CManager::EngageToMarriage] Query error: {}", e.what());
 			return;
 		}
 

src/db/src/Monarch.cpp

@@ -268,6 +268,8 @@ bool CMonarch::DelMonarch(int Empire)
 		{
 			return false;
 		}
+
+		txn.commit();
 	}
 	catch (const std::exception &e)
 	{
@@ -308,6 +310,8 @@ bool CMonarch::DelMonarch(const char *name)
 
 			return true;
 		}
+
+		txn.commit();
 	}
 	catch (const std::exception &e)
 	{

src/libsql/include/PgAsyncQuery.h

@@ -3,6 +3,9 @@
 #include <pqxx/pqxx>
 #include <string>
 
+#include <functional>
+using AsyncQueryCallback = std::function<void(const pqxx::result &, const std::string &error)>;
+
 class PgAsyncQuery
 {
 public:
@@ -10,6 +13,14 @@ public:
     std::string query;
     pqxx::params parameters;
 
+    bool hasCallback;
+    AsyncQueryCallback callback;
+
+    // Fire and Forget AsyncQuery
     PgAsyncQuery(int msgId, const std::string &sql, const pqxx::params &params = pqxx::params{})
-        : id(msgId), query(sql), parameters(params) {}
+        : id(msgId), query(sql), parameters(params), hasCallback(false) {}
-};
+
+    // Callback AsyncQuery
+    PgAsyncQuery(int msgId, const std::string &sql, const pqxx::params &params = pqxx::params{}, AsyncQueryCallback cb)
+        : id(msgId), query(sql), parameters(params), hasCallback(true), callback(std::move(cb)) {}
+};