diff --git a/Common.Library/Common.Library.csproj b/Common.Library/Common.Library.csproj
index b5352af..0a4e69d 100644
--- a/Common.Library/Common.Library.csproj
+++ b/Common.Library/Common.Library.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/Common.Library/SQL/Base/SQLBase.cs b/Common.Library/SQL/Base/SQLBase.cs
index 2875942..b493c53 100644
--- a/Common.Library/SQL/Base/SQLBase.cs
+++ b/Common.Library/SQL/Base/SQLBase.cs
@@ -14,22 +14,22 @@ namespace Common.Library.SQL.Base
}
public struct DBConnectionInformation
{
- public string DBHost {get;set;}
- public string DBName {get;set;}
- public string DBUserName {get;set;}
- public string DBPassword {get;set;}
- public DBType DBType {get;set;}
+ public string DBHost { get; set; }
+ public string DBName { get; set; }
+ public string DBUserName { get; set; }
+ public string DBPassword { get; set; }
+ public DBType DBType { get; set; }
public string GetConnectionString()
{
string rv = string.Empty;
- switch(DBType)
+ switch (DBType)
{
case DBType.MSSQL:
break;
case DBType.MYSQL:
- rv = string.Format("Server={0};Database={1};Uid={2};Pwd={3};SslMode=none", DBHost, DBName, DBUserName, DBPassword);
+ rv = string.Format("Server={0};Database={1};Uid={2};Pwd={3};", DBHost, DBName, DBUserName, DBPassword);
break;
}
diff --git a/Common.Library/SQL/MySQL/MySQL.cs b/Common.Library/SQL/MySQL/MySQL.cs
index 3bd0bff..d0b5eda 100644
--- a/Common.Library/SQL/MySQL/MySQL.cs
+++ b/Common.Library/SQL/MySQL/MySQL.cs
@@ -8,9 +8,9 @@ namespace Common.Library.SQL.MySQL
{
public class MySQL : SQLBase
{
- protected MySqlConnection DBConnection {get;set;}
- protected MySqlCommand DBCommand {get;set;}
- protected MySqlDataReader DBReader {get;set;}
+ protected MySqlConnection DBConnection { get; set; }
+ protected MySqlCommand DBCommand { get; set; }
+ protected MySqlDataReader DBReader { get; set; }
public MySQL(string server, string database, string username, string password)
{
@@ -28,17 +28,21 @@ namespace Common.Library.SQL.MySQL
{
DBConnectionInfo = connectionInformation;
}
-
+
protected override void InitConnection()
{
DBConnection = new MySqlConnection(DBConnectionInfo.GetConnectionString());
DBConnection.Open();
DBCommand = DBConnection.CreateCommand();
+
+ DBCommand.CommandType = CommandType.Text;
+ DBCommand.CommandText = "SET character_set_results=utf8mb4";
+ DBCommand.ExecuteNonQuery();
}
protected override void DisposeConnection()
{
- if(DBConnection.State == ConnectionState.Open)
+ if (DBConnection.State == ConnectionState.Open)
{
DBConnection.Close();
}
@@ -53,7 +57,7 @@ namespace Common.Library.SQL.MySQL
{
int? rv = null;
- if(!DBReader.IsDBNull(columnID))
+ if (!DBReader.IsDBNull(columnID))
{
rv = DBReader.GetInt32(columnID);
}
@@ -70,7 +74,7 @@ namespace Common.Library.SQL.MySQL
{
byte? rv = null;
- if(!DBReader.IsDBNull(columnID))
+ if (!DBReader.IsDBNull(columnID))
{
rv = DBReader.GetByte(columnID);
}
@@ -119,7 +123,7 @@ namespace Common.Library.SQL.MySQL
{
decimal? rv = null;
- if(!DBReader.IsDBNull(columnID))
+ if (!DBReader.IsDBNull(columnID))
{
rv = DBReader.GetDecimal(columnID);
}
@@ -136,7 +140,7 @@ namespace Common.Library.SQL.MySQL
{
long? rv = null;
- if(!DBReader.IsDBNull(columnID))
+ if (!DBReader.IsDBNull(columnID))
{
rv = DBReader.GetInt64(columnID);
}
@@ -153,7 +157,7 @@ namespace Common.Library.SQL.MySQL
{
short? rv = null;
- if(!DBReader.IsDBNull(columnID))
+ if (!DBReader.IsDBNull(columnID))
{
rv = DBReader.GetInt16(columnID);
}
@@ -170,7 +174,7 @@ namespace Common.Library.SQL.MySQL
{
string rv = string.Empty;
- if(!DBReader.IsDBNull(columnID))
+ if (!DBReader.IsDBNull(columnID))
{
rv = DBReader.GetString(columnID);
}
@@ -187,7 +191,7 @@ namespace Common.Library.SQL.MySQL
{
bool? rv = null;
- if(!DBReader.IsDBNull(columnID))
+ if (!DBReader.IsDBNull(columnID))
{
rv = DBReader.GetBoolean(columnID);
}
@@ -204,7 +208,7 @@ namespace Common.Library.SQL.MySQL
{
DateTime? rv = null;
- if(!DBReader.IsDBNull(columnID))
+ if (!DBReader.IsDBNull(columnID))
{
rv = GetDateTime(columnID);
}