From 4a4647de1d9fe5593089aea9420f33182181ad27 Mon Sep 17 00:00:00 2001 From: 28810 <28810@YEXIANGQIN> Date: Sun, 19 Jul 2020 07:22:48 +0800 Subject: [PATCH] update MySqlConnector 1.0.0 --- FreeSql.DbContext/FreeSql.DbContext.csproj | 2 +- FreeSql.DbContext/FreeSql.DbContext.xml | 16 ---------------- .../FreeSql.Provider.MySql.csproj | 2 +- .../FreeSql.Provider.MySql/MySqlAdo/MySqlAdo.cs | 6 +++++- .../MySqlAdo/MySqlConnectionPool.cs | 8 ++++++-- .../FreeSql.Provider.MySql/MySqlCodeFirst.cs | 6 +++++- Providers/FreeSql.Provider.MySql/MySqlDbFirst.cs | 6 +++++- Providers/FreeSql.Provider.MySql/MySqlUtils.cs | 4 ++++ .../FreeSql.Provider.MySqlConnector.csproj | 7 +++++-- .../FreeSqlMySqlConnectorGlobalExtensions.cs | 6 +++++- .../MySqlConnectorUtils.cs | 2 +- .../FreeSql.Provider.Oracle.csproj | 4 ++-- readme.md | 2 +- 13 files changed, 41 insertions(+), 30 deletions(-) diff --git a/FreeSql.DbContext/FreeSql.DbContext.csproj b/FreeSql.DbContext/FreeSql.DbContext.csproj index 5156e768..046d3b9c 100644 --- a/FreeSql.DbContext/FreeSql.DbContext.csproj +++ b/FreeSql.DbContext/FreeSql.DbContext.csproj @@ -37,7 +37,7 @@ - + diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml index 4854f49c..132d875e 100644 --- a/FreeSql.DbContext/FreeSql.DbContext.xml +++ b/FreeSql.DbContext/FreeSql.DbContext.xml @@ -125,13 +125,6 @@ 清空状态数据 - - - 根据 lambda 条件删除数据 - - - - 添加 @@ -486,14 +479,5 @@ - - - 批量注入 Repository，可以参考代码自行调整 - - - - - - diff --git a/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj b/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj index 15025909..665d61b2 100644 --- a/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj +++ b/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj @@ -26,7 +26,7 @@ - + diff --git a/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlAdo.cs b/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlAdo.cs index 17ea6496..64427c6a 100644 --- a/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlAdo.cs +++ b/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlAdo.cs @@ -1,12 +1,16 @@ using FreeSql.Internal; using FreeSql.Internal.Model; -using MySql.Data.MySqlClient; using FreeSql.Internal.ObjectPool; using System; using System.Collections; using System.Data.Common; using System.Text; using System.Threading; +#if MySqlConnector +using MySqlConnector; +#else +using MySql.Data.MySqlClient; +#endif namespace FreeSql.MySql { diff --git a/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs b/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs index 5c3fa614..770194fe 100644 --- a/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs +++ b/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs @@ -1,5 +1,4 @@ -using MySql.Data.MySqlClient; -using FreeSql.Internal.ObjectPool; +using FreeSql.Internal.ObjectPool; using System; using System.Collections.Concurrent; using System.Collections.Generic; @@ -7,6 +6,11 @@ using System.Data; using System.Data.Common; using System.Text.RegularExpressions; using System.Threading.Tasks; +#if MySqlConnector +using MySqlConnector; +#else +using MySql.Data.MySqlClient; +#endif namespace FreeSql.MySql { diff --git a/Providers/FreeSql.Provider.MySql/MySqlCodeFirst.cs b/Providers/FreeSql.Provider.MySql/MySqlCodeFirst.cs index b57ae165..7ee233bf 100644 --- a/Providers/FreeSql.Provider.MySql/MySqlCodeFirst.cs +++ b/Providers/FreeSql.Provider.MySql/MySqlCodeFirst.cs @@ -1,12 +1,16 @@ using FreeSql.Internal; using FreeSql.Internal.Model; -using MySql.Data.MySqlClient; using System; using System.Collections.Generic; using System.Data; using System.Linq; using System.Text; using System.Text.RegularExpressions; +#if MySqlConnector +using MySqlConnector; +#else +using MySql.Data.MySqlClient; +#endif namespace FreeSql.MySql { diff --git a/Providers/FreeSql.Provider.MySql/MySqlDbFirst.cs b/Providers/FreeSql.Provider.MySql/MySqlDbFirst.cs index 48a7b416..7253870b 100644 --- a/Providers/FreeSql.Provider.MySql/MySqlDbFirst.cs +++ b/Providers/FreeSql.Provider.MySql/MySqlDbFirst.cs @@ -1,13 +1,17 @@ using FreeSql.DatabaseModel; using FreeSql.Internal; using FreeSql.Internal.Model; -using MySql.Data.MySqlClient; using System; using System.Collections.Generic; using System.Data; using System.Linq; using System.Text; using System.Text.RegularExpressions; +#if MySqlConnector +using MySqlConnector; +#else +using MySql.Data.MySqlClient; +#endif namespace FreeSql.MySql { diff --git a/Providers/FreeSql.Provider.MySql/MySqlUtils.cs b/Providers/FreeSql.Provider.MySql/MySqlUtils.cs index fe49cd80..3986c65b 100644 --- a/Providers/FreeSql.Provider.MySql/MySqlUtils.cs +++ b/Providers/FreeSql.Provider.MySql/MySqlUtils.cs @@ -1,6 +1,10 @@ using FreeSql.Internal; using FreeSql.Internal.Model; +#if MySqlConnector +using MySqlConnector; +#else using MySql.Data.MySqlClient; +#endif using System; using System.Collections.Generic; using System.Data.Common; diff --git a/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj b/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj index 911d3bd7..255cb6d9 100644 --- a/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj +++ b/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj @@ -26,13 +26,12 @@ - + - @@ -40,5 +39,9 @@ + + + MySqlConnector + diff --git a/Providers/FreeSql.Provider.MySqlConnector/FreeSqlMySqlConnectorGlobalExtensions.cs b/Providers/FreeSql.Provider.MySqlConnector/FreeSqlMySqlConnectorGlobalExtensions.cs index 6b22af02..87c24e7c 100644 --- a/Providers/FreeSql.Provider.MySqlConnector/FreeSqlMySqlConnectorGlobalExtensions.cs +++ b/Providers/FreeSql.Provider.MySqlConnector/FreeSqlMySqlConnectorGlobalExtensions.cs @@ -1,9 +1,13 @@ using FreeSql; -using MySql.Data.MySqlClient; using System; using System.Collections.Generic; using System.Text; using System.Threading.Tasks; +#if MySqlConnector +using MySqlConnector; +#else +using MySql.Data.MySqlClient; +#endif public static class FreeSqlMySqlConnectorGlobalExtensions { diff --git a/Providers/FreeSql.Provider.MySqlConnector/MySqlConnectorUtils.cs b/Providers/FreeSql.Provider.MySqlConnector/MySqlConnectorUtils.cs index 085f2375..df8e23b4 100644 --- a/Providers/FreeSql.Provider.MySqlConnector/MySqlConnectorUtils.cs +++ b/Providers/FreeSql.Provider.MySqlConnector/MySqlConnectorUtils.cs @@ -1,6 +1,6 @@ using FreeSql.Internal; using FreeSql.Internal.Model; -using MySql.Data.MySqlClient; +using MySqlConnector; using System; using System.Collections.Generic; using System.Collections.Concurrent; diff --git a/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj b/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj index fb5b9009..b8eb1a89 100644 --- a/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj +++ b/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj @@ -26,11 +26,11 @@ - + - + diff --git a/readme.md b/readme.md index be745985..91ef06e9 100644 --- a/readme.md +++ b/readme.md @@ -181,7 +181,7 @@ Elapsed: 00:00:00.6495301; Query Entity Counts: 131072; ORM: Dapper [feijie999](https://github.com/feijie999)、 constantine -（QQ群：4336577） +QQ群：4336577(已满)、8578575(在线) ## 💕 　Donation