From fe6d6326243219df2904f5c19ed40e818bdb0920 Mon Sep 17 00:00:00 2001 From: 2881099 <2881099@qq.com> Date: Fri, 7 Jun 2019 18:23:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=B9=E9=87=8F=E6=8F=92?= =?UTF-8?q?=E5=85=A5/=E6=9B=B4=E6=96=B0=E5=A4=A7=E9=87=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=97=B6=EF=BC=8C=E6=9C=AA=E4=BD=BF=E7=94=A8NoneParam?= =?UTF-8?q?eter=EF=BC=8C=E4=BC=9A=E5=AF=BC=E8=87=B4=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=9C=AA=E6=89=A7=E8=A1=8C=E7=9A=84bug=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FreeSql.Extensions.LazyLoading.csproj | 2 +- FreeSql.Tests/UnitTest1.cs | 12 ++++++++++++ FreeSql/FreeSql.csproj | 2 +- FreeSql/Internal/CommonProvider/InsertProvider.cs | 2 +- FreeSql/Internal/CommonProvider/UpdateProvider.cs | 2 +- .../FreeSql.Provider.MySql.csproj | 2 +- .../FreeSql.Provider.MySqlConnector.csproj | 2 +- .../FreeSql.Provider.Oracle.csproj | 2 +- .../FreeSql.Provider.PostgreSQL.csproj | 2 +- .../FreeSql.Provider.SqlServer.csproj | 2 +- .../FreeSql.Provider.Sqlite.csproj | 2 +- 11 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj b/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj index 17df14ce..3a490ea7 100644 --- a/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj +++ b/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj @@ -2,7 +2,7 @@ netstandard2.0;net45 - 0.6.8 + 0.6.9 true YeXiangQin FreeSql 扩展包，可实现【延时加载】属性. diff --git a/FreeSql.Tests/UnitTest1.cs b/FreeSql.Tests/UnitTest1.cs index d6aa8ea1..ea48b4ca 100644 --- a/FreeSql.Tests/UnitTest1.cs +++ b/FreeSql.Tests/UnitTest1.cs @@ -267,6 +267,18 @@ namespace FreeSql.Tests { [Fact] public void Test1() { + var testaddlist = new List(); + for(var a = 0; a < 133905; a++) { + testaddlist.Add(new NewsArticle { + ArticleTitle = "testaddlist_topic" + a, + Hits = a, + }); + } + g.sqlite.Insert(testaddlist) + //.NoneParameter() + .ExecuteAffrows(); + + g.mysql.Aop.ParseExpression = (s, e) => { if (e.Expression.NodeType == ExpressionType.Call) { var callExp = e.Expression as MethodCallExpression; diff --git a/FreeSql/FreeSql.csproj b/FreeSql/FreeSql.csproj index 4c32cb45..499c1ef9 100644 --- a/FreeSql/FreeSql.csproj +++ b/FreeSql/FreeSql.csproj @@ -2,7 +2,7 @@ netstandard2.0;net45 - 0.6.8 + 0.6.9 true YeXiangQin FreeSql is the most convenient ORM in dotnet. It supports Mysql, Postgresql, SqlServer, Oracle and Sqlite. diff --git a/FreeSql/Internal/CommonProvider/InsertProvider.cs b/FreeSql/Internal/CommonProvider/InsertProvider.cs index b9095eb0..9ebdc0ed 100644 --- a/FreeSql/Internal/CommonProvider/InsertProvider.cs +++ b/FreeSql/Internal/CommonProvider/InsertProvider.cs @@ -91,7 +91,7 @@ namespace FreeSql.Internal.CommonProvider { var pamTotal = colSum * _source.Count; if (pamTotal < parameterLimit) return new[] { _source }; - var execCount = (int)Math.Ceiling(1.0 * pamTotal / parameterLimit); + var execCount = (int)Math.Ceiling(1.0 * pamTotal / takeMax / colSum); var ret = new List[execCount]; for (var a = 0; a < execCount; a++) { var subSource = new List(); diff --git a/FreeSql/Internal/CommonProvider/UpdateProvider.cs b/FreeSql/Internal/CommonProvider/UpdateProvider.cs index e34d715a..c5d17d13 100644 --- a/FreeSql/Internal/CommonProvider/UpdateProvider.cs +++ b/FreeSql/Internal/CommonProvider/UpdateProvider.cs @@ -96,7 +96,7 @@ namespace FreeSql.Internal.CommonProvider { var pamTotal = colSum * _source.Count; if (pamTotal < parameterLimit) return new[] { _source }; - var execCount = (int)Math.Ceiling(1.0 * pamTotal / parameterLimit); + var execCount = (int)Math.Ceiling(1.0 * pamTotal / takeMax / colSum); var ret = new List[execCount]; for (var a = 0; a < execCount; a++) { var subSource = new List(); diff --git a/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj b/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj index b38829be..93c45632 100644 --- a/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj +++ b/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj @@ -2,7 +2,7 @@ netstandard2.0;net452 - 0.6.8 + 0.6.9 true YeXiangQin FreeSql 数据库实现，基于 MySql 5.6 diff --git a/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj b/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj index b71a761b..5e1ce63f 100644 --- a/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj +++ b/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj @@ -2,7 +2,7 @@ netstandard2.0;net45 - 0.6.8 + 0.6.9 true YeXiangQin FreeSql 数据库实现，基于 MySql 5.6 diff --git a/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj b/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj index 3c8d59c9..b53610f6 100644 --- a/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj +++ b/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj @@ -2,7 +2,7 @@ netstandard2.0;net45 - 0.6.8 + 0.6.9 true YeXiangQin FreeSql 数据库实现，基于 Oracle 11 diff --git a/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj b/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj index d625393e..896c9f4f 100644 --- a/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj +++ b/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj @@ -2,7 +2,7 @@ netstandard2.0;net45 - 0.6.8 + 0.6.9 true YeXiangQin FreeSql 数据库实现，基于 PostgreSQL 9.5 diff --git a/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj b/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj index 2959a9b2..fc9e1384 100644 --- a/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj +++ b/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj @@ -2,7 +2,7 @@ netstandard2.0;net451 - 0.6.8 + 0.6.9 true YeXiangQin FreeSql 数据库实现，基于 SqlServer 2005+，并根据版本适配分页方法：row_number 或 offset fetch next diff --git a/Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj b/Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj index f021b60d..5e3e0aaa 100644 --- a/Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj +++ b/Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj @@ -2,7 +2,7 @@ netstandard2.0;net45 - 0.6.8 + 0.6.9 true YeXiangQin FreeSql 数据库实现，基于 Sqlite 3.0