diff --git a/FFXIVClassic Common Class Lib/Sql.cs b/FFXIVClassic Common Class Lib/Sql.cs
index fcad7791..2de92bc0 100644
--- a/FFXIVClassic Common Class Lib/Sql.cs
+++ b/FFXIVClassic Common Class Lib/Sql.cs
@@ -5,76 +5,16 @@ using System.Text;
using System.Threading.Tasks;
using MySql.Data.MySqlClient;
using NLog;
+using System.Data;
+using System.Data.Common;
namespace FFXIVClassic.Common
{
- /*
- class SqlCommand
+ // todo:
+ // havent decided whether it's worth wrapping every sql class
+ // so i'll just leave it with logger for now
+ public class Sql
{
public static Logger Log = LogManager.GetCurrentClassLogger();
-
- public SqlCommand()
- {
-
- }
-
- public SqlCommand(string cmdText)
- {
- try
- {
- MySqlCommand.MySqlCommand("");
- }
- }
- public SqlCommand(string cmdText, MySqlConnection connection);
- public SqlCommand(string cmdText, MySqlConnection connection, MySqlTransaction transaction);
-
- ~SqlCommand()
- {
-
- }
-
- public int CacheAge { get; set; }
-
- public string CommandText { get; set; }
- public int CommandTimeout { get; set; }
-
- public CommandType CommandType { get; set; }
-
- public MySqlConnection Connection { get; set; }
-
- public bool DesignTimeVisible { get; set; }
- public bool EnableCaching { get; set; }
-
- public bool IsPrepared { get; }
-
- public long LastInsertedId { get; }
-
- public MySqlParameterCollection Parameters { get; }
-
- public MySqlTransaction Transaction { get; set; }
- public UpdateRowSource UpdatedRowSource { get; set; }
- protected DbConnection DbConnection { get; set; }
- protected DbParameterCollection DbParameterCollection { get; }
- protected DbTransaction DbTransaction { get; set; }
-
- public IAsyncResult BeginExecuteNonQuery();
- public IAsyncResult BeginExecuteNonQuery(AsyncCallback callback, object stateObject);
- public IAsyncResult BeginExecuteReader();
- public IAsyncResult BeginExecuteReader(CommandBehavior behavior);
- public void Cancel();
- public SqlCommand Clone();
- public MySqlParameter CreateParameter();
- public void Dispose();
- public int EndExecuteNonQuery(IAsyncResult asyncResult);
- public MySqlDataReader EndExecuteReader(IAsyncResult result);
- public int ExecuteNonQuery();
- public MySqlDataReader ExecuteReader();
- public MySqlDataReader ExecuteReader(CommandBehavior behavior);
- public object ExecuteScalar();
- public void Prepare();
- protected DbParameter CreateDbParameter();
- protected void Dispose(bool disposing);
- protected DbDataReader ExecuteDbDataReader(CommandBehavior behavior);
}
- */
}
diff --git a/FFXIVClassic Common Class Lib/packages.config b/FFXIVClassic Common Class Lib/packages.config
index b2de2ed0..8b2d1420 100644
--- a/FFXIVClassic Common Class Lib/packages.config
+++ b/FFXIVClassic Common Class Lib/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj b/FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj
index 550b75a0..8f83df96 100644
--- a/FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj
+++ b/FFXIVClassic Lobby Server/FFXIVClassic Lobby Server.csproj
@@ -58,8 +58,9 @@
..\FFXIVClassic Common Class Lib\bin\Debug\FFXIVClassic.Common.dll
-
- ..\packages\MySql.Data.6.9.7\lib\net45\MySql.Data.dll
+
+ ..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll
+ True
..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll
@@ -112,6 +113,7 @@
Always
+
Designer
diff --git a/FFXIVClassic Lobby Server/NLog.config b/FFXIVClassic Lobby Server/NLog.config
index c152c074..8495609d 100644
--- a/FFXIVClassic Lobby Server/NLog.config
+++ b/FFXIVClassic Lobby Server/NLog.config
@@ -29,7 +29,10 @@
-->
-
+
+
+
+
diff --git a/FFXIVClassic Lobby Server/app.config b/FFXIVClassic Lobby Server/app.config
index d0ac62a0..143834c2 100644
--- a/FFXIVClassic Lobby Server/app.config
+++ b/FFXIVClassic Lobby Server/app.config
@@ -1,9 +1,9 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/FFXIVClassic Lobby Server/packages.config b/FFXIVClassic Lobby Server/packages.config
index 5a3427bf..dd879142 100644
--- a/FFXIVClassic Lobby Server/packages.config
+++ b/FFXIVClassic Lobby Server/packages.config
@@ -2,7 +2,7 @@
-
+
diff --git a/FFXIVClassic Map Server/App.config b/FFXIVClassic Map Server/App.config
index c45a8c71..63198b4c 100644
--- a/FFXIVClassic Map Server/App.config
+++ b/FFXIVClassic Map Server/App.config
@@ -1,11 +1,11 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj b/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
index f178f04e..c5c79140 100644
--- a/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
+++ b/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
@@ -49,8 +49,8 @@
..\packages\MoonSharp.1.2.1.0\lib\net40-client\MoonSharp.Interpreter.dll
-
- ..\packages\MySql.Data.6.9.7\lib\net45\MySql.Data.dll
+
+ ..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll
True
diff --git a/FFXIVClassic Map Server/NLog.config b/FFXIVClassic Map Server/NLog.config
index 839421a0..a12d0fdc 100644
--- a/FFXIVClassic Map Server/NLog.config
+++ b/FFXIVClassic Map Server/NLog.config
@@ -32,7 +32,8 @@
-
+
+
diff --git a/FFXIVClassic Map Server/packages.config b/FFXIVClassic Map Server/packages.config
index 6d8ab227..fa384c55 100644
--- a/FFXIVClassic Map Server/packages.config
+++ b/FFXIVClassic Map Server/packages.config
@@ -3,7 +3,7 @@
-
+
diff --git a/data/lobby_config.ini b/data/lobby_config.ini
index 2251736f..f8aa676b 100644
--- a/data/lobby_config.ini
+++ b/data/lobby_config.ini
@@ -8,4 +8,4 @@ host=127.0.0.1
port=3306
database=ffxiv_server
username=root
-password=
+password=root
diff --git a/data/map_config.ini b/data/map_config.ini
index 2251736f..f8aa676b 100644
--- a/data/map_config.ini
+++ b/data/map_config.ini
@@ -8,4 +8,4 @@ host=127.0.0.1
port=3306
database=ffxiv_server
username=root
-password=
+password=root