summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/account-server/dalstorage.cpp85
-rw-r--r--src/account-server/dalstorage.hpp7
-rw-r--r--src/account-server/dalstoragesql.hpp8
-rw-r--r--src/dal/sqlitedataprovider.cpp2
4 files changed, 77 insertions, 25 deletions
diff --git a/src/account-server/dalstorage.cpp b/src/account-server/dalstorage.cpp
index 90f157b0..04efe8a3 100644
--- a/src/account-server/dalstorage.cpp
+++ b/src/account-server/dalstorage.cpp
@@ -467,10 +467,14 @@ bool DALStorage::doesCharacterNameExist(const std::string& name)
return true;
}
-bool DALStorage::updateCharacter(Character *character)
+bool DALStorage::updateCharacter(Character *character,
+ bool startTransaction)
{
// Update the database Character data (see CharacterData for details)
- mDb->beginTransaction();
+ if (startTransaction)
+ {
+ mDb->beginTransaction();
+ }
try
{
std::ostringstream sqlUpdateCharacterInfo;
@@ -505,7 +509,10 @@ bool DALStorage::updateCharacter(Character *character)
catch (const dal::DbSqlQueryExecFailure& e)
{
// TODO: throw an exception.
- mDb->rollbackTransaction();
+ if (startTransaction)
+ {
+ mDb->rollbackTransaction();
+ }
LOG_ERROR("(DALStorage::updateCharacter #1) SQL query failure: " << e.what());
return false;
}
@@ -523,7 +530,10 @@ bool DALStorage::updateCharacter(Character *character)
catch (const dal::DbSqlQueryExecFailure& e)
{
// TODO: throw an exception.
- mDb->rollbackTransaction();
+ if (startTransaction)
+ {
+ mDb->rollbackTransaction();
+ }
LOG_ERROR("(DALStorage::updateCharacter #2) SQL query failure: " << e.what());
return false;
}
@@ -545,7 +555,10 @@ bool DALStorage::updateCharacter(Character *character)
catch (const dal::DbSqlQueryExecFailure& e)
{
// TODO: throw an exception.
- mDb->rollbackTransaction();
+ if (startTransaction)
+ {
+ mDb->rollbackTransaction();
+ }
LOG_ERROR("(DALStorage::updateCharacter #3) SQL query failure: " << e.what());
return false;
}
@@ -591,12 +604,18 @@ bool DALStorage::updateCharacter(Character *character)
catch (const dal::DbSqlQueryExecFailure& e)
{
// TODO: throw an exception.
- mDb->rollbackTransaction();
+ if (startTransaction)
+ {
+ mDb->rollbackTransaction();
+ }
LOG_ERROR("(DALStorage::updateCharacter #4) SQL query failure: " << e.what());
return false;
}
- mDb->commitTransaction();
+ if (startTransaction)
+ {
+ mDb->commitTransaction();
+ }
return true;
}
@@ -721,7 +740,10 @@ void DALStorage::flush(Account *account)
{
if ((*it)->getDatabaseID() >= 0)
{
- updateCharacter(*it);
+ /* 2nd. parameter false means: don't start a transaction in
+ the updateCharacter method, cause we did this already a few
+ lines above */
+ updateCharacter(*it, false);
}
else
{
@@ -1193,33 +1215,48 @@ void DALStorage::delCharacter(int charId, bool startTransaction = true) const
mDb->beginTransaction();
try
{
+ std::ostringstream sql;
+
// delete the inventory of the character
- std::ostringstream sqlDeleteInventoryTable;
- sqlDeleteInventoryTable
- << "DELETE FROM " << INVENTORIES_TBL_NAME
+ sql << "DELETE FROM " << INVENTORIES_TBL_NAME
<< " WHERE owner_id = '" << charId << "';";
- mDb->execSql(sqlDeleteInventoryTable.str());
+ mDb->execSql(sql.str());
+
+ // delete the skills of the character
+ sql.str("");
+ sql << "DELETE FROM " << CHAR_SKILLS_TBL_NAME
+ << " WHERE char_id = '" << charId << "';";
+ mDb->execSql(sql.str());
// delete from the quests table
- std::ostringstream sqlDeleteQuestsTable;
- sqlDeleteQuestsTable
- << "DELETE FROM " << QUESTS_TBL_NAME
+ sql.str("");
+ sql << "DELETE FROM " << QUESTS_TBL_NAME
<< " WHERE owner_id = '" << charId << "';";
- mDb->execSql(sqlDeleteQuestsTable.str());
+ mDb->execSql(sql.str());
// delete from the guilds table
- std::ostringstream sqlDeleteGuildsTable;
- sqlDeleteGuildsTable
- << "DELETE FROM " << GUILD_MEMBERS_TBL_NAME
+ sql.str("");
+ sql << "DELETE FROM " << GUILD_MEMBERS_TBL_NAME
<< " WHERE member_id = '" << charId << "';";
- mDb->execSql(sqlDeleteGuildsTable.str());
+ mDb->execSql(sql.str());
+
+ // delete auctions of the character
+ sql.str("");
+ sql << "DELETE FROM " << AUCTION_TBL_NAME
+ << " WHERE char_id = '" << charId << "';";
+ mDb->execSql(sql.str());
+
+ // delete bids made on auctions made by the character
+ sql.str("");
+ sql << "DELETE FROM " << AUCTION_BIDS_TBL_NAME
+ << " WHERE char_id = '" << charId << "';";
+ mDb->execSql(sql.str());
// now delete the character itself.
- std::ostringstream sqlDeleteCharactersTable;
- sqlDeleteCharactersTable
- << "DELETE FROM " << CHARACTERS_TBL_NAME
+ sql.str("");
+ sql << "DELETE FROM " << CHARACTERS_TBL_NAME
<< " WHERE id = '" << charId << "';";
- mDb->execSql(sqlDeleteCharactersTable.str());
+ mDb->execSql(sql.str());
if (startTransaction)
mDb->commitTransaction();
diff --git a/src/account-server/dalstorage.hpp b/src/account-server/dalstorage.hpp
index f67ed264..1e8566ef 100644
--- a/src/account-server/dalstorage.hpp
+++ b/src/account-server/dalstorage.hpp
@@ -180,9 +180,14 @@ class DALStorage
* Primary usage should be storing characterdata received from a
* game server.
* returns true if succefull, false otherwise.
+ * @param ptr Character to store values in the database.
+ * @param startTransaction set to false if this method is called as
+ * nested transaction.
+ * @return true on success
*/
bool
- updateCharacter(Character *ptr);
+ updateCharacter(Character *ptr,
+ bool startTransaction = true);
/**
* Save changes of a skill to the database permanently.
diff --git a/src/account-server/dalstoragesql.hpp b/src/account-server/dalstoragesql.hpp
index b08c895b..30b5b57e 100644
--- a/src/account-server/dalstoragesql.hpp
+++ b/src/account-server/dalstoragesql.hpp
@@ -107,6 +107,14 @@ static char const *WORLD_STATES_TBL_NAME = "tmw_world_states";
/**
* TABLE: tmw_auctions
+ * Store items auctions.
*/
static char const *AUCTION_TBL_NAME = "tmw_auctions";
+
+/**
+ * TABLE: tmw_auction_bids
+ * Store bids on auctions.
+ */
+static char const *AUCTION_BIDS_TBL_NAME = "tmw_auction_bids";
+
#endif // _TMWSERV_DALSTORAGE_SQL_H_
diff --git a/src/dal/sqlitedataprovider.cpp b/src/dal/sqlitedataprovider.cpp
index fb539ece..feb85760 100644
--- a/src/dal/sqlitedataprovider.cpp
+++ b/src/dal/sqlitedataprovider.cpp
@@ -153,6 +153,8 @@ SqLiteDataProvider::execSql(const std::string& sql,
if (errCode != SQLITE_OK) {
std::string msg(sqlite3_errmsg(mDb));
+ LOG_ERROR("Error in SQL: " << msg);
+
// free memory
sqlite3_free_table(result);
sqlite3_free(errMsg);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 19:27:38 +0000