From 5cbae2b83336b7824ca4714c11cb4cce558c7f97 Mon Sep 17 00:00:00 2001
From: Arthur Ice <addtheice@gmail.com>
Date: Sat, 4 Oct 2014 14:12:16 -0700
Subject: [PATCH] GetcommandSettings converted to QueryDatabase

---
 common/shareddb.cpp | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/common/shareddb.cpp b/common/shareddb.cpp
index ba4d34413..3a4e59f86 100644
--- a/common/shareddb.cpp
+++ b/common/shareddb.cpp
@@ -1239,27 +1239,20 @@ int32 SharedDatabase::DeleteStalePlayerBackups() {
 }
 
 bool SharedDatabase::GetCommandSettings(std::map<std::string,uint8> &commands) {
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	char *query = 0;
-	MYSQL_RES *result;
-	MYSQL_ROW row;
-	query = new char[256];
-	strcpy(query, "SELECT command,access from commands");
-	commands.clear();
-	if (RunQuery(query, strlen(query), errbuf, &result)) {
-		safe_delete_array(query);
-		while((row = mysql_fetch_row(result))) {
-			commands[row[0]]=atoi(row[1]);
-		}
-		mysql_free_result(result);
-		return true;
-	} else {
-		std::cerr << "Error in GetCommands query '" << query << "' " << errbuf << std::endl;
-		safe_delete_array(query);
+
+	const std::string query = "SELECT command, access FROM commands";
+	auto results = QueryDatabase(query);
+	if (!results.Success()) {
+        std::cerr << "Error in GetCommands query '" << query << "' " << results.ErrorMessage() << std::endl;
 		return false;
 	}
 
-	return false;
+    commands.clear();
+
+    for (auto row = results.begin(); row != results.end(); ++row)
+        commands[row[0]]=atoi(row[1]);
+
+    return true;
 }
 
 bool SharedDatabase::LoadSkillCaps() {