Merge pull request #134 from xiangxiren/master

MySqlConnector版本升级到1.0.0
dotnetcore · Jul 14, 2020 · 40d5bd7 · 40d5bd7
2 parents fdfdb6f + e2dab2e
commit 40d5bd7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/SmartSql.Bulk.MySql/BulkInsert.cs b/src/SmartSql.Bulk.MySql/BulkInsert.cs
@@ -1,5 +1,4 @@
-using MySql.Data.MySqlClient;
-using SmartSql.DbSession;
+using SmartSql.DbSession;
 using SmartSql.Reflection.TypeConstants;
 using System;
 using System.Data;
@@ -9,8 +8,10 @@
 using System.Threading.Tasks;
 
 #if MySqlConnector
+using MySqlConnector;
 namespace SmartSql.Bulk.MySqlConnector
 #else
+using MySql.Data.MySqlClient;
 namespace SmartSql.Bulk.MySql
 #endif
 {

diff --git a/src/SmartSql.Bulk.MySqlConnector/SmartSql.Bulk.MySqlConnector.csproj b/src/SmartSql.Bulk.MySqlConnector/SmartSql.Bulk.MySqlConnector.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MySqlConnector" Version="0.52.0" />
+    <PackageReference Include="MySqlConnector" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SmartSql/DataSource/DbProviderManager.cs b/src/SmartSql/DataSource/DbProviderManager.cs
@@ -1,8 +1,6 @@
-using SmartSql.Exceptions;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data.Common;
-using System.Reflection;
 using SmartSql.Reflection;
 
 namespace SmartSql.DataSource
@@ -39,7 +37,7 @@ public class DbProviderManager
         {
             Name = DbProvider.MYSQL_CONNECTOR,
             ParameterPrefix = "?",
-            Type = "MySql.Data.MySqlClient.MySqlClientFactory,MySqlConnector",
+            Type = "MySqlConnector.MySqlConnectorFactory,MySqlConnector",
             SelectAutoIncrement = ";Select Last_Insert_Id();"
         };