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

24
FFXIVClassic Map Server/Database.cs
View file

@ -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)
{ {
@ -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");
@ -679,7 +679,7 @@ namespace FFXIVClassic_Map_Server
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);
} }
} }
@ -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";