aboutsummaryrefslogtreecommitdiff
path: root/src/server/database/Database
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2016-11-07 10:55:29 +0100
committerShauren <shauren.trinity@gmail.com>2016-11-07 10:55:29 +0100
commitf9b4f686c83bcc97fad84f1d8775963c4a108541 (patch)
treef91bdfe31eed193beec1bd6bd954fa679a969c25 /src/server/database/Database
parentb01820704846fff493ed6839a8849d5e3f5742f7 (diff)
Core/Scenarios: Removed a bad usage of blocking db queries when saving scenario to db
Diffstat (limited to 'src/server/database/Database')
-rw-r--r--src/server/database/Database/Implementation/CharacterDatabase.cpp4
-rw-r--r--src/server/database/Database/Implementation/CharacterDatabase.h4
2 files changed, 2 insertions, 6 deletions
diff --git a/src/server/database/Database/Implementation/CharacterDatabase.cpp b/src/server/database/Database/Implementation/CharacterDatabase.cpp
index 5845a0d6a3a..9027b3f575a 100644
--- a/src/server/database/Database/Implementation/CharacterDatabase.cpp
+++ b/src/server/database/Database/Implementation/CharacterDatabase.cpp
@@ -735,9 +735,7 @@ void CharacterDatabaseConnection::DoPrepareStatements()
// Scenario
PrepareStatement(CHAR_SEL_SCENARIO_INSTANCE_CRITERIA_FOR_INSTANCE, "SELECT criteria, counter, date FROM instance_scenario_progress WHERE id = ?", CONNECTION_SYNCH);
- PrepareStatement(CHAR_SEL_SCENARIO_INSTANCE_CRITERIA, "SELECT counter, date FROM instance_scenario_progress WHERE id = ? AND criteria = ?", CONNECTION_SYNCH);
+ PrepareStatement(CHAR_DEL_SCENARIO_INSTANCE_CRITERIA, "DELETE FROM instance_scenario_progress WHERE id = ? AND criteria = ?", CONNECTION_ASYNC);
PrepareStatement(CHAR_INS_SCENARIO_INSTANCE_CRITERIA, "INSERT INTO instance_scenario_progress (id, criteria, counter, date) VALUES (?, ?, ?, ?)", CONNECTION_ASYNC);
PrepareStatement(CHAR_DEL_SCENARIO_INSTANCE_CRITERIA_FOR_INSTANCE, "DELETE FROM instance_scenario_progress WHERE id = ?", CONNECTION_ASYNC);
- PrepareStatement(CHAR_UPD_SCENARIO_INSTANCE_CRITERIA, "UPDATE instance_scenario_progress SET counter = ?, date = ? WHERE id = ? AND criteria = ?", CONNECTION_ASYNC);
- PrepareStatement(CHAR_DEL_INVALID_SCENARIO_INSTANCE_CRITERIA, "DELETE FROM instance_scenario_progress WHERE id = ? AND criteria = ?", CONNECTION_ASYNC);
}
diff --git a/src/server/database/Database/Implementation/CharacterDatabase.h b/src/server/database/Database/Implementation/CharacterDatabase.h
index 02969290007..91f8a51eda3 100644
--- a/src/server/database/Database/Implementation/CharacterDatabase.h
+++ b/src/server/database/Database/Implementation/CharacterDatabase.h
@@ -624,11 +624,9 @@ enum CharacterDatabaseStatements
CHAR_INS_BLACKMARKET_AUCTIONS,
CHAR_SEL_SCENARIO_INSTANCE_CRITERIA_FOR_INSTANCE,
- CHAR_SEL_SCENARIO_INSTANCE_CRITERIA,
+ CHAR_DEL_SCENARIO_INSTANCE_CRITERIA,
CHAR_INS_SCENARIO_INSTANCE_CRITERIA,
CHAR_DEL_SCENARIO_INSTANCE_CRITERIA_FOR_INSTANCE,
- CHAR_UPD_SCENARIO_INSTANCE_CRITERIA,
- CHAR_DEL_INVALID_SCENARIO_INSTANCE_CRITERIA,
MAX_CHARACTERDATABASE_STATEMENTS
};