mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-24 13:47:46 +00:00
Code Activity

Fixed MySQL Syntax issues

Browse source
This commit is contained in:
Jordan Maxwell 2016-08-18 23:36:04 -05:00
parent 7c9077beec
commit 270d4ce436
1 changed files with 42 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
FFXIVClassic Map Server/Database.cs
View file

@ -30,10 +30,10 @@ namespace FFXIVClassic_Map_Server
cmd.Parameters.AddWithValue("@sessionId", sessionId); cmd.Parameters.AddWithValue("@sessionId", sessionId);
using (MySqlDataReader Reader = cmd.ExecuteReader()) using (MySqlDataReader Reader = cmd.ExecuteReader())
{ {
while (Reader.Read()) while (Reader.Read())
{ {
id = Reader.GetUInt32("userId"); id = Reader.GetUInt32("userId");
} }
} }
} }
catch (MySqlException e) catch (MySqlException e)
@ -43,11 +43,11 @@ namespace FFXIVClassic_Map_Server
finally finally
{ {
conn.Dispose(); conn.Dispose();
} }
} }
return id; return id;
} }
public static DBWorld GetServer(uint serverId) public static DBWorld GetServer(uint serverId)
{ {
using (var conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) using (var conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD)))
@ -56,7 +56,7 @@ namespace FFXIVClassic_Map_Server
try try
{ {
conn.Open(); conn.Open();
world = conn.Query<DBWorld>("SELECT * FROM servers WHERE id=@ServerId", new {ServerId = serverId}).SingleOrDefault(); world = conn.Query<DBWorld>("SELECT * FROM servers WHERE id=@ServerId", new { ServerId = serverId }).SingleOrDefault();
} }
catch (MySqlException e) catch (MySqlException e)
{ {
@ -69,7 +69,7 @@ namespace FFXIVClassic_Map_Server
return world; return world;
} }
} }
public static List<Npc> GetNpcList() public static List<Npc> GetNpcList()
{ {
@ -99,7 +99,7 @@ namespace FFXIVClassic_Map_Server
using (var conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) using (var conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD)))
{ {
Dictionary<uint, Item> gamedataItems = new Dictionary<uint, Item>(); Dictionary<uint, Item> gamedataItems = new Dictionary<uint, Item>();
try try
{ {
conn.Open(); conn.Open();
@ -145,7 +145,7 @@ namespace FFXIVClassic_Map_Server
{ {
conn.Dispose(); conn.Dispose();
} }
return gamedataItems; return gamedataItems;
} }
} }
@ -244,7 +244,7 @@ namespace FFXIVClassic_Map_Server
public static void SavePlayerPosition(Player player) public static void SavePlayerPosition(Player player)
{ {
string query; string query;
MySqlCommand cmd; MySqlCommand cmd;
using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD)))
@ -262,7 +262,7 @@ namespace FFXIVClassic_Map_Server
currentZoneId = @zoneId currentZoneId = @zoneId
WHERE id = @charaId WHERE id = @charaId
"; ";
cmd = new MySqlCommand(query, conn); cmd = new MySqlCommand(query, conn);
cmd.Parameters.AddWithValue("@charaId", player.actorId); cmd.Parameters.AddWithValue("@charaId", player.actorId);
cmd.Parameters.AddWithValue("@x", player.positionX); cmd.Parameters.AddWithValue("@x", player.positionX);
@ -371,9 +371,9 @@ namespace FFXIVClassic_Map_Server
} }
public static void LoadPlayerCharacter(Player player) public static void LoadPlayerCharacter(Player player)
{ {
string query; string query;
MySqlCommand cmd; MySqlCommand cmd;
using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD)))
{ {
@ -404,7 +404,7 @@ namespace FFXIVClassic_Map_Server
restBonus, restBonus,
achievementPoints, achievementPoints,
playTime playTime
FROM characters WHERE id = @charId"; FROM characters WHERE id = @charId";
cmd = new MySqlCommand(query, conn); cmd = new MySqlCommand(query, conn);
cmd.Parameters.AddWithValue("@charId", player.actorId); cmd.Parameters.AddWithValue("@charId", player.actorId);
@ -437,7 +437,7 @@ namespace FFXIVClassic_Map_Server
player.playTime = reader.GetUInt32(19); player.playTime = reader.GetUInt32(19);
} }
} }
//Get class levels //Get class levels
query = @" query = @"
SELECT SELECT
@ -470,7 +470,7 @@ namespace FFXIVClassic_Map_Server
{ {
if (reader.Read()) if (reader.Read())
{ {
player.charaWork.battleSave.skillLevel[Player.CLASSID_PUG-1] = reader.GetInt16("pug"); player.charaWork.battleSave.skillLevel[Player.CLASSID_PUG - 1] = reader.GetInt16("pug");
player.charaWork.battleSave.skillLevel[Player.CLASSID_GLA - 1] = reader.GetInt16("gla"); player.charaWork.battleSave.skillLevel[Player.CLASSID_GLA - 1] = reader.GetInt16("gla");
player.charaWork.battleSave.skillLevel[Player.CLASSID_MRD - 1] = reader.GetInt16("mrd"); player.charaWork.battleSave.skillLevel[Player.CLASSID_MRD - 1] = reader.GetInt16("mrd");
player.charaWork.battleSave.skillLevel[Player.CLASSID_ARC - 1] = reader.GetInt16("arc"); player.charaWork.battleSave.skillLevel[Player.CLASSID_ARC - 1] = reader.GetInt16("arc");
@ -519,7 +519,7 @@ namespace FFXIVClassic_Map_Server
player.charaWork.parameterSave.state_mainSkillLevel = player.charaWork.battleSave.skillLevel[reader.GetByte(4) - 1]; player.charaWork.parameterSave.state_mainSkillLevel = player.charaWork.battleSave.skillLevel[reader.GetByte(4) - 1];
} }
} }
//Load appearance //Load appearance
query = @" query = @"
SELECT SELECT
@ -662,7 +662,7 @@ namespace FFXIVClassic_Map_Server
player.timers[i] = reader.GetUInt32(i); player.timers[i] = reader.GetUInt32(i);
} }
} }
//Load Hotbar //Load Hotbar
query = @" query = @"
SELECT SELECT
@ -675,11 +675,11 @@ namespace FFXIVClassic_Map_Server
cmd.Parameters.AddWithValue("@charId", player.actorId); cmd.Parameters.AddWithValue("@charId", player.actorId);
cmd.Parameters.AddWithValue("@classId", player.charaWork.parameterSave.state_mainSkill[0]); cmd.Parameters.AddWithValue("@classId", player.charaWork.parameterSave.state_mainSkill[0]);
using (MySqlDataReader reader = cmd.ExecuteReader()) using (MySqlDataReader reader = cmd.ExecuteReader())
{ {
while (reader.Read()) while (reader.Read())
{ {
int index = reader.GetUInt16(0); int index = reader.GetUInt16(0);
player.charaWork.command[index+32] = reader.GetUInt32(1); player.charaWork.command[index + 32] = reader.GetUInt32(1);
player.charaWork.parameterSave.commandSlot_recastTime[index] = reader.GetUInt32(2); player.charaWork.parameterSave.commandSlot_recastTime[index] = reader.GetUInt32(2);
} }
} }
@ -692,7 +692,7 @@ namespace FFXIVClassic_Map_Server
questData, questData,
questFlags questFlags
FROM characters_quest_scenario WHERE characterId = @charId"; FROM characters_quest_scenario WHERE characterId = @charId";
cmd = new MySqlCommand(query, conn); cmd = new MySqlCommand(query, conn);
cmd.Parameters.AddWithValue("@charId", player.actorId); cmd.Parameters.AddWithValue("@charId", player.actorId);
using (MySqlDataReader reader = cmd.ExecuteReader()) using (MySqlDataReader reader = cmd.ExecuteReader())
@ -777,7 +777,7 @@ namespace FFXIVClassic_Map_Server
{ {
int npcLSId = reader.GetUInt16(0); int npcLSId = reader.GetUInt16(0);
player.playerWork.npcLinkshellChatCalling[npcLSId] = reader.GetBoolean(1); player.playerWork.npcLinkshellChatCalling[npcLSId] = reader.GetBoolean(1);
player.playerWork.npcLinkshellChatExtra[npcLSId] = reader.GetBoolean(2); player.playerWork.npcLinkshellChatExtra[npcLSId] = reader.GetBoolean(2);
} }
} }
@ -952,7 +952,7 @@ namespace FFXIVClassic_Map_Server
cmd.Parameters.AddWithValue("@type", type); cmd.Parameters.AddWithValue("@type", type);
using (MySqlDataReader reader = cmd.ExecuteReader()) using (MySqlDataReader reader = cmd.ExecuteReader())
{ {
while (reader.Read()) while (reader.Read())
{ {
uint uniqueId = reader.GetUInt32(0); uint uniqueId = reader.GetUInt32(0);
@ -999,7 +999,7 @@ namespace FFXIVClassic_Map_Server
{ {
conn.Open(); conn.Open();
string query = @" string query = @"
INSERT INTO server_items INSERT INTO server_items
@ -1017,7 +1017,7 @@ namespace FFXIVClassic_Map_Server
"; ";
MySqlCommand cmd2 = new MySqlCommand(query2, conn); MySqlCommand cmd2 = new MySqlCommand(query2, conn);
cmd.Parameters.AddWithValue("@itemId", itemId); cmd.Parameters.AddWithValue("@itemId", itemId);
cmd.Parameters.AddWithValue("@quality", quality); cmd.Parameters.AddWithValue("@quality", quality);
cmd.Parameters.AddWithValue("@itemType", itemType); cmd.Parameters.AddWithValue("@itemType", itemType);
@ -1053,12 +1053,12 @@ namespace FFXIVClassic_Map_Server
{ {
conn.Open(); conn.Open();
string query = @" string query = @"
UPDATE characters_inventory UPDATE characters_inventory
SET quantity = @quantity SET quantity = @quantity
WHERE characterId = @charId AND slot = @slot AND inventoryType = @type; WHERE characterId = @charId AND slot = @slot AND inventoryType = @type;
"; ";
MySqlCommand cmd = new MySqlCommand(query, conn); MySqlCommand cmd = new MySqlCommand(query, conn);
cmd.Parameters.AddWithValue("@charId", player.actorId); cmd.Parameters.AddWithValue("@charId", player.actorId);
cmd.Parameters.AddWithValue("@quantity", quantity); cmd.Parameters.AddWithValue("@quantity", quantity);
@ -1098,7 +1098,7 @@ namespace FFXIVClassic_Map_Server
DELETE FROM server_items DELETE FROM server_items
WHERE id = @serverItemId; WHERE id = @serverItemId;
"; ";
MySqlCommand cmd = new MySqlCommand(query, conn); MySqlCommand cmd = new MySqlCommand(query, conn);
cmd.Parameters.AddWithValue("@charId", player.actorId); cmd.Parameters.AddWithValue("@charId", player.actorId);
@ -1168,7 +1168,7 @@ namespace FFXIVClassic_Map_Server
try try
{ {
conn.Open(); conn.Open();
//Load Last 5 Completed //Load Last 5 Completed
string query = @" string query = @"
SELECT SELECT
@ -1183,7 +1183,7 @@ namespace FFXIVClassic_Map_Server
int count = 0; int count = 0;
while (reader.Read()) while (reader.Read())
{ {
uint id = reader.GetUInt32(0); uint id = reader.GetUInt32(0);
latestAchievements[count++] = id; latestAchievements[count++] = id;
} }
} }
@ -1210,7 +1210,7 @@ namespace FFXIVClassic_Map_Server
try try
{ {
conn.Open(); conn.Open();
string query = @" string query = @"
SELECT packetOffsetId SELECT packetOffsetId
FROM characters_achievements FROM characters_achievements
@ -1222,7 +1222,7 @@ namespace FFXIVClassic_Map_Server
using (MySqlDataReader reader = cmd.ExecuteReader()) using (MySqlDataReader reader = cmd.ExecuteReader())
{ {
while (reader.Read()) while (reader.Read())
{ {
uint offset = reader.GetUInt32(0); uint offset = reader.GetUInt32(0);
if (offset < 0 || offset >= cheevosPacket.achievementFlags.Length) if (offset < 0 || offset >= cheevosPacket.achievementFlags.Length)
@ -1230,7 +1230,7 @@ namespace FFXIVClassic_Map_Server
Program.Log.Error("SQL Error; achievement flag offset id out of range: " + offset); Program.Log.Error("SQL Error; achievement flag offset id out of range: " + offset);
continue; continue;
} }
cheevosPacket.achievementFlags[offset] = true; cheevosPacket.achievementFlags[offset] = true;
} }
} }
} }
@ -1262,10 +1262,7 @@ namespace FFXIVClassic_Map_Server
INSERT INTO supportdesk_tickets INSERT INTO supportdesk_tickets
(id, title, body, langCode) (id, title, body, langCode)
VALUES VALUES
(@id, @title, @body, @langCode) (@id, @title, @body, @langCode)";
ON DUPLICATE KEY UPDATE
questData = @questData, questFlags = @questFlags
";
cmd = new MySqlCommand(query, conn); cmd = new MySqlCommand(query, conn);
cmd.Parameters.AddWithValue("@id", gmTicket.ticketIssueIndex); cmd.Parameters.AddWithValue("@id", gmTicket.ticketIssueIndex);
@ -1286,7 +1283,7 @@ namespace FFXIVClassic_Map_Server
} }
} }
public static string[] getFAQNames(uint lanCode=1) public static string[] getFAQNames(uint lanCode = 1)
{ {
string[] faqs = null; string[] faqs = null;
List<string> raw = new List<string>(); List<string> raw = new List<string>();
@ -1300,7 +1297,7 @@ namespace FFXIVClassic_Map_Server
SELECT SELECT
id, id,
label, label,
sort, sort
FROM supportdesk_faqs FROM supportdesk_faqs
ORDER BY sort"; ORDER BY sort";
@ -1329,7 +1326,7 @@ namespace FFXIVClassic_Map_Server
return faqs; return faqs;
} }
public static string getFAQBody(uint id, uint lanCode=1) public static string getFAQBody(uint id, uint lanCode = 1)
{ {
string body = string.Empty; string body = string.Empty;
using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD)))
@ -1342,15 +1339,16 @@ namespace FFXIVClassic_Map_Server
SELECT SELECT
body body
FROM supportdesk_faqs FROM supportdesk_faqs
WHERE id=" + id; WHERE id=@id";
MySqlCommand cmd = new MySqlCommand(query, conn); MySqlCommand cmd = new MySqlCommand(query, conn);
cmd.Parameters.AddWithValue("@id", id);
using (MySqlDataReader reader = cmd.ExecuteReader()) using (MySqlDataReader reader = cmd.ExecuteReader())
{ {
while (reader.Read()) while (reader.Read())
{ {
body = reader.GetString(2); body = reader.GetString(0);
} }
} }
} }
@ -1380,7 +1378,7 @@ namespace FFXIVClassic_Map_Server
SELECT SELECT
id, id,
title, title,
sort, sort
FROM supportdesk_issues FROM supportdesk_issues
ORDER BY sort"; ORDER BY sort";