Develop

src/game/CharacterDatabaseCleaner.cpp

@@ -46,64 +46,16 @@ void CharacterDatabaseCleaner::CleanDatabase()
     CharacterDatabase.Execute("UPDATE saved_variables SET cleaning_flags = 0");
 }
 
-void CharacterDatabaseCleaner::CheckUnique(const char* column, const char* table, bool (*check)(uint32))
-{
-    QueryResult* result = CharacterDatabase.PQuery("SELECT DISTINCT %s FROM %s", column, table);
-    if (!result)
-    {
-        sLog.outString("Table %s is empty.", table);
-        return;
-    }
-
-    bool found = false;
-    std::ostringstream ss;
-    BarGoLink bar(result->GetRowCount());
-    do
-    {
-        bar.step();
-
-        Field *fields = result->Fetch();
-
-        uint32 id = fields[0].GetUInt32();
-
-        if (!check(id))
-        {
-            if (!found)
-            {
-                ss << "DELETE FROM " << table << " WHERE " << column << " IN (";
-                found = true;
-            }
-            else
-                ss << ",";
-            ss << id;
-        }
-    }
-    while (result->NextRow());
-    delete result;
-
-    if (found)
-    {
-        ss << ")";
-        CharacterDatabase.Execute(ss.str().c_str());
-    }
-}
-
-bool CharacterDatabaseCleaner::SkillCheck(uint32 skill)
-{
-    return sSkillLineStore.LookupEntry(skill);
-}
-
 void CharacterDatabaseCleaner::CleanCharacterSkills()
 {
-    CheckUnique("skill", "character_skills", &SkillCheck);
-}
-
-bool CharacterDatabaseCleaner::SpellCheck(uint32 spell_id)
-{
-    return sSpellStore.LookupEntry(spell_id);
+    uint32 count = sSkillLineStore.GetNumRows();
+
+    CharacterDatabase.PExecute("DELETE FROM character_skills WHERE skill >= %u", count);
 }
 
 void CharacterDatabaseCleaner::CleanCharacterSpell()
 {
-    CheckUnique("spell", "character_spell", &SpellCheck);
+    uint32 count = sSpellStore.GetNumRows();
+
+    CharacterDatabase.PExecute("DELETE FROM character_spell WHERE spell >= %u", count);
 }

src/game/CharacterDatabaseCleaner.h

@@ -32,11 +32,6 @@ namespace CharacterDatabaseCleaner
 
     void CleanDatabase();
 
-    void CheckUnique(const char* column, const char* table, bool (*check)(uint32));
-
-    bool SkillCheck(uint32 skill);
-    bool SpellCheck(uint32 spell_id);
-
     void CleanCharacterSkills();
     void CleanCharacterSpell();
 }