Skip to content

Commit fe6d632

Browse files
committed
修复批量插入/更新大量数据时,未使用NoneParameter,会导致部分未执行的bug;
1 parent eb2d258 commit fe6d632

File tree

11 files changed

+22
-10
lines changed

11 files changed

+22
-10
lines changed

Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
5-
<Version>0.6.8</Version>
5+
<Version>0.6.9</Version>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>YeXiangQin</Authors>
88
<Description>FreeSql 扩展包,可实现【延时加载】属性.</Description>

FreeSql.Tests/UnitTest1.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,18 @@ public static string FormatDateTime() {
267267
[Fact]
268268
public void Test1() {
269269

270+
var testaddlist = new List<NewsArticle>();
271+
for(var a = 0; a < 133905; a++) {
272+
testaddlist.Add(new NewsArticle {
273+
ArticleTitle = "testaddlist_topic" + a,
274+
Hits = a,
275+
});
276+
}
277+
g.sqlite.Insert<NewsArticle>(testaddlist)
278+
//.NoneParameter()
279+
.ExecuteAffrows();
280+
281+
270282
g.mysql.Aop.ParseExpression = (s, e) => {
271283
if (e.Expression.NodeType == ExpressionType.Call) {
272284
var callExp = e.Expression as MethodCallExpression;

FreeSql/FreeSql.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
5-
<Version>0.6.8</Version>
5+
<Version>0.6.9</Version>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>YeXiangQin</Authors>
88
<Description>FreeSql is the most convenient ORM in dotnet. It supports Mysql, Postgresql, SqlServer, Oracle and Sqlite.</Description>

FreeSql/Internal/CommonProvider/InsertProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ protected List<T1>[] SplitSource(int valuesLimit, int parameterLimit) {
9191
var pamTotal = colSum * _source.Count;
9292
if (pamTotal < parameterLimit) return new[] { _source };
9393

94-
var execCount = (int)Math.Ceiling(1.0 * pamTotal / parameterLimit);
94+
var execCount = (int)Math.Ceiling(1.0 * pamTotal / takeMax / colSum);
9595
var ret = new List<T1>[execCount];
9696
for (var a = 0; a < execCount; a++) {
9797
var subSource = new List<T1>();

FreeSql/Internal/CommonProvider/UpdateProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ internal List<T1>[] SplitSource(int valuesLimit, int parameterLimit) {
9696
var pamTotal = colSum * _source.Count;
9797
if (pamTotal < parameterLimit) return new[] { _source };
9898

99-
var execCount = (int)Math.Ceiling(1.0 * pamTotal / parameterLimit);
99+
var execCount = (int)Math.Ceiling(1.0 * pamTotal / takeMax / colSum);
100100
var ret = new List<T1>[execCount];
101101
for (var a = 0; a < execCount; a++) {
102102
var subSource = new List<T1>();

Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
5-
<Version>0.6.8</Version>
5+
<Version>0.6.9</Version>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>YeXiangQin</Authors>
88
<Description>FreeSql 数据库实现,基于 MySql 5.6</Description>

Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
5-
<Version>0.6.8</Version>
5+
<Version>0.6.9</Version>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>YeXiangQin</Authors>
88
<Description>FreeSql 数据库实现,基于 MySql 5.6</Description>

Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
5-
<Version>0.6.8</Version>
5+
<Version>0.6.9</Version>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>YeXiangQin</Authors>
88
<Description>FreeSql 数据库实现,基于 Oracle 11</Description>

Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
5-
<Version>0.6.8</Version>
5+
<Version>0.6.9</Version>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>YeXiangQin</Authors>
88
<Description>FreeSql 数据库实现,基于 PostgreSQL 9.5</Description>

Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
5-
<Version>0.6.8</Version>
5+
<Version>0.6.9</Version>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>YeXiangQin</Authors>
88
<Description>FreeSql 数据库实现,基于 SqlServer 2005+,并根据版本适配分页方法:row_number 或 offset fetch next</Description>

0 commit comments

Comments
 (0)