Merge branch 'RunQueryToDatabaseQuery_zone_AA' of https://github.com/addtheice/Server into addtheice-RunQueryToDatabaseQuery_zone_AA

zone/aa.cpp

@@ -1466,13 +1466,19 @@ void Zone::LoadAAs() {
 bool ZoneDatabase::LoadAAEffects2() {
 	aa_effects.clear();	//start fresh
 
-	char errbuf[MYSQL_ERRMSG_SIZE];
+	const std::string query = "SELECT aaid, slot, effectid, base1, base2 FROM aa_effects ORDER BY aaid ASC, slot ASC";
-	char *query = 0;
+	auto results = QueryDatabase(query);
-	MYSQL_RES *result;
+	if (!results.Success()) {
-	MYSQL_ROW row;
+        LogFile->write(EQEMuLog::Error, "Error in ZoneDatabase::LoadAAEffects2 query: '%s': %s", query.c_str(), results.ErrorMessage().c_str());
-	if (RunQuery(query, MakeAnyLenString(&query, "SELECT aaid, slot, effectid, base1, base2 FROM aa_effects ORDER BY aaid ASC, slot ASC"), errbuf, &result)) {
+		return false;
-		int count = 0;
+	}
-		while((row = mysql_fetch_row(result))!= nullptr) {
+
+	if (results.RowCount()) { //no results
+        LogFile->write(EQEMuLog::Error, "Error loading AA Effects, none found in the database.");
+        return false;
+	}
+
+    for(auto row = results.begin(); row != results.end(); ++row) {
         int aaid = atoi(row[0]);
         int slot = atoi(row[1]);
         int effectid = atoi(row[2]);
@@ -1482,16 +1488,8 @@ bool ZoneDatabase::LoadAAEffects2() {
         aa_effects[aaid][slot].base1 = base1;
         aa_effects[aaid][slot].base2 = base2;
         aa_effects[aaid][slot].slot = slot;	//not really needed, but we'll populate it just in case
-			count++;
     }
-		mysql_free_result(result);
+
-		if (count < 1)	//no results
-			LogFile->write(EQEMuLog::Error, "Error loading AA Effects, none found in the database.");
-	} else {
-		LogFile->write(EQEMuLog::Error, "Error in ZoneDatabase::LoadAAEffects2 query: '%s': %s", query, errbuf);
-		return false;
-	}
-	safe_delete_array(query);
 	return true;
 }
 void Client::ResetAA(){
@@ -1633,45 +1631,37 @@ void Client::InspectBuffs(Client* Inspector, int Rank)
 
 //this really need to be renamed to LoadAAActions()
 bool ZoneDatabase::LoadAAEffects() {
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	MYSQL_RES *result;
-	MYSQL_ROW row;
-
 	memset(AA_Actions, 0, sizeof(AA_Actions));	//I hope the compiler is smart about this size...
 
-	const char *query = "SELECT aaid,rank,reuse_time,spell_id,target,nonspell_action,nonspell_mana,nonspell_duration,"
+	const std::string query = "SELECT aaid, rank, reuse_time, spell_id, target, "
+                            "nonspell_action, nonspell_mana, nonspell_duration, "
                             "redux_aa, redux_rate, redux_aa2, redux_rate2 FROM aa_actions";
+    auto results = QueryDatabase(query);
+    if (!results.Success()) {
+        LogFile->write(EQEMuLog::Error, "Error in LoadAAEffects query '%s': %s", query.c_str(), results.ErrorMessage().c_str());
+		return false;
+    }
 
-	if(RunQuery(query, static_cast<uint32>(strlen(query)), errbuf, &result)) {
+    for (auto row = results.begin(); row != results.end(); ++row) {
-		//safe_delete_array(query);
+
-		int r;
+        int aaid = atoi(row[0]);
-		while ((row = mysql_fetch_row(result))) {
+        int rank = atoi(row[1]);
-			r = 0;
-			int aaid = atoi(row[r++]);
-			int rank = atoi(row[r++]);
         if(aaid < 0 || aaid >= aaHighestID || rank < 0 || rank >= MAX_AA_ACTION_RANKS)
             continue;
         AA_DBAction *caction = &AA_Actions[aaid][rank];
 
-			caction->reuse_time = atoi(row[r++]);
+        caction->reuse_time = atoi(row[2]);
-			caction->spell_id = atoi(row[r++]);
+        caction->spell_id = atoi(row[3]);
-			caction->target = (aaTargetType) atoi(row[r++]);
+        caction->target = (aaTargetType) atoi(row[4]);
-			caction->action = (aaNonspellAction) atoi(row[r++]);
+        caction->action = (aaNonspellAction) atoi(row[5]);
-			caction->mana_cost = atoi(row[r++]);
+        caction->mana_cost = atoi(row[6]);
-			caction->duration = atoi(row[r++]);
+        caction->duration = atoi(row[7]);
-			caction->redux_aa = (aaID) atoi(row[r++]);
+        caction->redux_aa = (aaID) atoi(row[8]);
-			caction->redux_rate = atoi(row[r++]);
+        caction->redux_rate = atoi(row[9]);
-			caction->redux_aa2 = (aaID) atoi(row[r++]);
+        caction->redux_aa2 = (aaID) atoi(row[10]);
-			caction->redux_rate2 = atoi(row[r++]);
+        caction->redux_rate2 = atoi(row[11]);
 
     }
-		mysql_free_result(result);
-	}
-	else {
-		LogFile->write(EQEMuLog::Error, "Error in LoadAAEffects query '%s': %s", query, errbuf);;
-		//safe_delete_array(query);
-		return false;
-	}
 
 	return true;
 }
@@ -1683,23 +1673,20 @@ bool ZoneDatabase::LoadAAEffects() {
 
 //AndMetal: this may now be obsolete since we have Zone::GetTotalAALevels()
 uint8 ZoneDatabase::GetTotalAALevels(uint32 skill_id) {
-	char errbuf[MYSQL_ERRMSG_SIZE];
+
-	char *query = 0;
+	std::string query = StringFormat("SELECT count(slot) FROM aa_effects WHERE aaid = %i", skill_id);
-	MYSQL_RES *result;
+    auto results = QueryDatabase(query);
-	MYSQL_ROW row;
+    if (!results.Success()) {
-	int total=0;
+        LogFile->write(EQEMuLog::Error, "Error in GetTotalAALevels '%s: %s", query.c_str(), results.ErrorMessage().c_str());
-	if (RunQuery(query, MakeAnyLenString(&query, "SELECT count(slot) from aa_effects where aaid=%i", skill_id), errbuf, &result)) {
+        return 0;
-		safe_delete_array(query);
-		if (mysql_num_rows(result) == 1) {
-			row = mysql_fetch_row(result);
-			total=atoi(row[0]);
     }
-		mysql_free_result(result);
+
-	} else {
+    if (results.RowCount() != 1)
-		LogFile->write(EQEMuLog::Error, "Error in GetTotalAALevels '%s: %s", query, errbuf);
+        return 0;
-		safe_delete_array(query);
+
-	}
+    auto row = results.begin();
-	return total;
+
+	return atoi(row[0]);
 }
 
 //this will allow us to count the number of effects for an AA by pulling the info from memory instead of the database. hopefully this will same some CPU cycles
@@ -1727,59 +1714,54 @@ void ZoneDatabase::FillAAEffects(SendAA_Struct* aa_struct){
 	if(!aa_struct)
 		return;
 
-	char errbuf[MYSQL_ERRMSG_SIZE];
+	std::string query = StringFormat("SELECT effectid, base1, base2, slot from aa_effects where aaid=%i order by slot asc", aa_struct->id);
-	char *query = 0;
+	auto results = QueryDatabase(query);
-	MYSQL_RES *result;
+	if (!results.Success()) {
-	MYSQL_ROW row;
+        LogFile->write(EQEMuLog::Error, "Error in Client::FillAAEffects query: '%s': %s", query.c_str(), results.ErrorMessage().c_str());
-	if (RunQuery(query, MakeAnyLenString(&query, "SELECT effectid, base1, base2, slot from aa_effects where aaid=%i order by slot asc", aa_struct->id), errbuf, &result)) {
+        return;
-		int ndx=0;
-		while((row = mysql_fetch_row(result))!=nullptr) {
-			aa_struct->abilities[ndx].skill_id=atoi(row[0]);
-			aa_struct->abilities[ndx].base1=atoi(row[1]);
-			aa_struct->abilities[ndx].base2=atoi(row[2]);
-			aa_struct->abilities[ndx].slot=atoi(row[3]);
-			ndx++;
 	}
-		mysql_free_result(result);
+
-	} else {
+	int index = 0;
-		LogFile->write(EQEMuLog::Error, "Error in Client::FillAAEffects query: '%s': %s", query, errbuf);
+    for (auto row = results.begin(); row != results.end(); ++row, ++index) {
+		aa_struct->abilities[index].skill_id=atoi(row[0]);
+		aa_struct->abilities[index].base1=atoi(row[1]);
+		aa_struct->abilities[index].base2=atoi(row[2]);
+		aa_struct->abilities[index].slot=atoi(row[3]);
 	}
-	safe_delete_array(query);
 }
 
 uint32 ZoneDatabase::CountAAs(){
-	char errbuf[MYSQL_ERRMSG_SIZE];
+
-	char *query = 0;
+	const std::string query = "SELECT count(title_sid) FROM altadv_vars";
-	MYSQL_RES *result;
+	auto results = QueryDatabase(query);
-	MYSQL_ROW row;
+	if (!results.Success()) {
-	int count=0;
+        LogFile->write(EQEMuLog::Error, "Error in ZoneDatabase::CountAAs query '%s': %s", query.c_str(), results.ErrorMessage().c_str());
-	if (RunQuery(query, MakeAnyLenString(&query, "SELECT count(title_sid) from altadv_vars"), errbuf, &result)) {
+        return 0;
-		if((row = mysql_fetch_row(result))!=nullptr)
-			count = atoi(row[0]);
-		mysql_free_result(result);
-	} else {
-		LogFile->write(EQEMuLog::Error, "Error in ZoneDatabase::CountAAs query '%s': %s", query, errbuf);
 	}
-	safe_delete_array(query);
+
-	return count;
+	if (results.RowCount() != 1)
+        return 0;
+
+    auto row = results.begin();
+
+	return atoi(row[0]);;
 }
 
 uint32 ZoneDatabase::CountAAEffects() {
-	char errbuf[MYSQL_ERRMSG_SIZE];
+
-	char *query = 0;
+	const std::string query = "SELECT count(id) FROM aa_effects";
-	MYSQL_RES *result;
+	auto results = QueryDatabase(query);
-	MYSQL_ROW row;
+	if (!results.Success()) {
-	int count=0;
+        LogFile->write(EQEMuLog::Error, "Error in ZoneDatabase::CountAALevels query '%s': %s", query.c_str(), results.ErrorMessage().c_str());
-	if (RunQuery(query, MakeAnyLenString(&query, "SELECT count(id) from aa_effects"), errbuf, &result)) {
+        return 0;
-		if((row = mysql_fetch_row(result))!=nullptr){
-			count = atoi(row[0]);
 	}
-		mysql_free_result(result);
+
-	} else {
+	if (results.RowCount() != 1)
-		LogFile->write(EQEMuLog::Error, "Error in ZoneDatabase::CountAALevels query '%s': %s", query, errbuf);
+        return 0;
-	}
+
-	safe_delete_array(query);
+    auto row = results.begin();
-	return count;
+
+	return atoi(row[0]);
 }
 
 uint32 ZoneDatabase::GetSizeAA(){
@@ -1792,110 +1774,81 @@ uint32 ZoneDatabase::GetSizeAA(){
 void ZoneDatabase::LoadAAs(SendAA_Struct **load){
 	if(!load)
 		return;
-	char errbuf[MYSQL_ERRMSG_SIZE];
+
-	char *query = 0;
+	std::string query = "SELECT skill_id FROM altadv_vars ORDER BY skill_id";
-	MYSQL_RES *result;
+	auto results = QueryDatabase(query);
-	MYSQL_ROW row;
+	if (results.Success()) {
-	if (RunQuery(query, MakeAnyLenString(&query, "SELECT skill_id from altadv_vars order by skill_id"), errbuf, &result)) {
+		int skill = 0, index = 0;
-		int skill=0,ndx=0;
+		for (auto row = results.begin(); row != results.end(); ++row, ++index) {
-		while((row = mysql_fetch_row(result))!=nullptr) {
 			skill = atoi(row[0]);
-			load[ndx] = GetAASkillVars(skill);
+			load[index] = GetAASkillVars(skill);
-			load[ndx]->seq = ndx+1;
+			load[index]->seq = index+1;
-			ndx++;
 		}
-		mysql_free_result(result);
 	} else {
-		LogFile->write(EQEMuLog::Error, "Error in ZoneDatabase::LoadAAs query '%s': %s", query, errbuf);
+		LogFile->write(EQEMuLog::Error, "Error in ZoneDatabase::LoadAAs query '%s': %s", query.c_str(), results.ErrorMessage().c_str());
 	}
-	safe_delete_array(query);
 
 	AARequiredLevelAndCost.clear();
+    query = "SELECT skill_id, level, cost from aa_required_level_cost order by skill_id";
+    results = QueryDatabase(query);
+    if (!results.Success()) {
+        LogFile->write(EQEMuLog::Error, "Error in ZoneDatabase::LoadAAs query '%s': %s", query.c_str(), results.ErrorMessage().c_str());
+        return;
+    }
 
-	if (RunQuery(query, MakeAnyLenString(&query, "SELECT skill_id, level, cost from aa_required_level_cost order by skill_id"), errbuf, &result))
-	{
     AALevelCost_Struct aalcs;
-		while((row = mysql_fetch_row(result))!=nullptr)
+    for (auto row = results.begin(); row != results.end(); ++row)
     {
         aalcs.Level = atoi(row[1]);
         aalcs.Cost = atoi(row[2]);
         AARequiredLevelAndCost[atoi(row[0])] = aalcs;
     }
-		mysql_free_result(result);
-	}
-	else
-		LogFile->write(EQEMuLog::Error, "Error in ZoneDatabase::LoadAAs query '%s': %s", query, errbuf);
 
-	safe_delete_array(query);
 }
 
 SendAA_Struct* ZoneDatabase::GetAASkillVars(uint32 skill_id)
 {
-	char errbuf[MYSQL_ERRMSG_SIZE];
+	std::string query = "SET @row = 0"; //initialize "row" variable in database for next query
-	char *query = 0;
+    auto results = QueryDatabase(query);
-	SendAA_Struct* sendaa = nullptr;
+    if (!results.Success()) {
-	uchar* buffer;
+        LogFile->write(EQEMuLog::Error, "Error in GetAASkillVars '%s': %s", query.c_str(), results.ErrorMessage().c_str());
-	if (RunQuery(query, MakeAnyLenString(&query, "SET @row = 0"), errbuf)) {	//initialize "row" variable in database for next query
+        return nullptr;
-		safe_delete_array(query);
+    }
-		MYSQL_RES *result;	//we don't really need these unless we get to this point, so why bother?
-		MYSQL_ROW row;
 
-		if (RunQuery(query, MakeAnyLenString(&query,
+    query = StringFormat("SELECT a.cost, a.max_level, a.hotkey_sid, a.hotkey_sid2, a.title_sid, a.desc_sid, a.type, "
-			"SELECT "
+                        "COALESCE ("	//So we can return 0 if it's null.
-				"a.cost, "
+                        "("	// this is our derived table that has the row #
-				"a.max_level, "
+                            // that we can SELECT from, because the client is stupid.
-				"a.hotkey_sid, "
+                        "SELECT p.prereq_index_num "
-				"a.hotkey_sid2, "
+                        "FROM (SELECT a2.skill_id, @row := @row + 1 AS prereq_index_num "
-				"a.title_sid, "
+						"FROM altadv_vars a2) AS p "
-				"a.desc_sid, "
+                        "WHERE p.skill_id = a.prereq_skill), 0) "
-				"a.type, "
+                        "AS prereq_skill_index, a.prereq_minpoints, a.spell_type, a.spell_refresh, a.classes, "
-				"COALESCE("	//so we can return 0 if it's null
+                        "a.berserker, a.spellid, a.class_type, a.name, a.cost_inc, a.aa_expansion, a.special_category, "
-					"("	//this is our derived table that has the row # that we can SELECT from, because the client is stupid
+                        "a.sof_type, a.sof_cost_inc, a.sof_max_level, a.sof_next_skill, "
-					"SELECT "
-						"p.prereq_index_num "
-					"FROM "
-						"("
-						"SELECT "
-							"a2.skill_id, "
-							"@row := @row + 1 AS prereq_index_num "
-						"FROM "
-							"altadv_vars a2"
-						") AS p "
-					"WHERE "
-						"p.skill_id = a.prereq_skill"
-					"), "
-					"0) AS prereq_skill_index, "
-				"a.prereq_minpoints, "
-				"a.spell_type, "
-				"a.spell_refresh, "
-				"a.classes, "
-				"a.berserker, "
-				"a.spellid, "
-				"a.class_type, "
-				"a.name, "
-				"a.cost_inc, "
-				"a.aa_expansion, "
-				"a.special_category, "
-				"a.sof_type, "
-				"a.sof_cost_inc, "
-				"a.sof_max_level, "
-				"a.sof_next_skill, "
                         "a.clientver, "	// Client Version 0 = None, 1 = All, 2 = Titanium/6.2, 4 = SoF 5 = SOD 6 = UF
-				"a.account_time_required, "
+                        "a.account_time_required, a.sof_current_level, a.sof_next_id, a.level_inc "
-				"a.sof_current_level,"
+                        "FROM altadv_vars a WHERE skill_id=%i", skill_id);
-				"a.sof_next_id, "
+    results = QueryDatabase(query);
-				"a.level_inc "
+    if (!results.Success()) {
-			" FROM altadv_vars a WHERE skill_id=%i", skill_id), errbuf, &result)) {
+        LogFile->write(EQEMuLog::Error, "Error in GetAASkillVars '%s': %s", query.c_str(), results.ErrorMessage().c_str());
-			safe_delete_array(query);
+        return nullptr;
-			if (mysql_num_rows(result) == 1) {
+    }
+
+    if (results.RowCount() != 1)
+        return nullptr;
+
     int total_abilities = GetTotalAALevels(skill_id);	//eventually we'll want to use zone->GetTotalAALevels(skill_id) since it should save queries to the DB
 	int totalsize = total_abilities * sizeof(AA_Ability) + sizeof(SendAA_Struct);
 
+    SendAA_Struct* sendaa = nullptr;
+    uchar* buffer;
+
 	buffer = new uchar[totalsize];
 	memset(buffer,0,totalsize);
 	sendaa = (SendAA_Struct*)buffer;
 
-				row = mysql_fetch_row(result);
+	auto row = results.begin();
 
 	//ATOI IS NOT UNSIGNED LONG-SAFE!!!
 
@@ -1927,6 +1880,7 @@ SendAA_Struct* ZoneDatabase::GetAASkillVars(uint32 skill_id)
 		sendaa->next_id=0xFFFFFFFF;
 
 	sendaa->cost_inc = atoi(row[16]);
+
 	// Begin SoF Specific/Adjusted AA Fields
 	sendaa->aa_expansion = atoul(row[17]);
 	sendaa->special_category = atoul(row[18]);
@@ -1936,20 +1890,12 @@ SendAA_Struct* ZoneDatabase::GetAASkillVars(uint32 skill_id)
 	sendaa->sof_next_skill = atoul(row[22]);
 	sendaa->clientver = atoul(row[23]);
 	sendaa->account_time_required = atoul(row[24]);
+
 	//Internal use only - not sent to client
 	sendaa->sof_current_level = atoul(row[25]);
 	sendaa->sof_next_id = atoul(row[26]);
 	sendaa->level_inc = static_cast<uint8>(atoul(row[27]));
-			}
+
-			mysql_free_result(result);
-		} else {
-			LogFile->write(EQEMuLog::Error, "Error in GetAASkillVars '%s': %s", query, errbuf);
-			safe_delete_array(query);
-		}
-	} else {
-		LogFile->write(EQEMuLog::Error, "Error in GetAASkillVars '%s': %s", query, errbuf);
-		safe_delete_array(query);
-	}
 	return sendaa;
 }