diff --git a/Examples/orm_vs/orm_vs.csproj b/Examples/orm_vs/orm_vs.csproj index 4e6eb813..4ee359da 100644 --- a/Examples/orm_vs/orm_vs.csproj +++ b/Examples/orm_vs/orm_vs.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/FreeSql.DbContext/DbContext/DbContextAsync.cs b/FreeSql.DbContext/DbContext/DbContextAsync.cs index 4cac04a2..88969bd7 100644 --- a/FreeSql.DbContext/DbContext/DbContextAsync.cs +++ b/FreeSql.DbContext/DbContext/DbContextAsync.cs @@ -17,7 +17,7 @@ namespace FreeSql return SaveChangesSuccess(); } - static Dictionary>>> _dicExecCommandDbContextBetchAsync = new Dictionary>>>(); + static Dictionary>>> _dicExecCommandDbContextBatchAsync = new Dictionary>>>(); async internal Task ExecCommandAsync() { if (isExecCommanding) return; @@ -27,9 +27,9 @@ namespace FreeSql ExecCommandInfo oldinfo = null; var states = new List(); - Func> dbContextBetch = methodName => + Func> dbContextBatch = methodName => { - if (_dicExecCommandDbContextBetchAsync.TryGetValue(oldinfo.stateType, out var trydic) == false) + if (_dicExecCommandDbContextBatchAsync.TryGetValue(oldinfo.stateType, out var trydic) == false) trydic = new Dictionary>>(); if (trydic.TryGetValue(methodName, out var tryfunc) == false) { @@ -53,19 +53,19 @@ namespace FreeSql }; Func funcDelete = async () => { - _affrows += await dbContextBetch("DbContextBetchRemoveAsync"); + _affrows += await dbContextBatch("DbContextBatchRemoveAsync"); states.Clear(); }; Func funcInsert = async () => { - _affrows += await dbContextBetch("DbContextBetchAddAsync"); + _affrows += await dbContextBatch("DbContextBatchAddAsync"); states.Clear(); }; Func funcUpdate = async (isLiveUpdate) => { var affrows = 0; - if (isLiveUpdate) affrows = await dbContextBetch("DbContextBetchUpdateNowAsync"); - else affrows = await dbContextBetch("DbContextBetchUpdateAsync"); + if (isLiveUpdate) affrows = await dbContextBatch("DbContextBatchUpdateNowAsync"); + else affrows = await dbContextBatch("DbContextBatchUpdateAsync"); if (affrows == -999) { //最后一个元素已被删除 states.RemoveAt(states.Count - 1); diff --git a/FreeSql.DbContext/DbContext/DbContextSync.cs b/FreeSql.DbContext/DbContext/DbContextSync.cs index cbec1023..88fc4ca5 100644 --- a/FreeSql.DbContext/DbContext/DbContextSync.cs +++ b/FreeSql.DbContext/DbContext/DbContextSync.cs @@ -30,7 +30,7 @@ namespace FreeSql return SaveChangesSuccess(); } - static Dictionary>> _dicExecCommandDbContextBetch = new Dictionary>>(); + static Dictionary>> _dicExecCommandDbContextBatch = new Dictionary>>(); bool isExecCommanding = false; internal void ExecCommand() { @@ -41,9 +41,9 @@ namespace FreeSql ExecCommandInfo oldinfo = null; var states = new List(); - Func dbContextBetch = methodName => + Func dbContextBatch = methodName => { - if (_dicExecCommandDbContextBetch.TryGetValue(oldinfo.stateType, out var trydic) == false) + if (_dicExecCommandDbContextBatch.TryGetValue(oldinfo.stateType, out var trydic) == false) trydic = new Dictionary>(); if (trydic.TryGetValue(methodName, out var tryfunc) == false) { @@ -67,19 +67,19 @@ namespace FreeSql }; Action funcDelete = () => { - _affrows += dbContextBetch("DbContextBetchRemove"); + _affrows += dbContextBatch("DbContextBatchRemove"); states.Clear(); }; Action funcInsert = () => { - _affrows += dbContextBetch("DbContextBetchAdd"); + _affrows += dbContextBatch("DbContextBatchAdd"); states.Clear(); }; Action funcUpdate = isLiveUpdate => { var affrows = 0; - if (isLiveUpdate) affrows = dbContextBetch("DbContextBetchUpdateNow"); - else affrows = dbContextBetch("DbContextBetchUpdate"); + if (isLiveUpdate) affrows = dbContextBatch("DbContextBatchUpdateNow"); + else affrows = dbContextBatch("DbContextBatchUpdate"); if (affrows == -999) { //最后一个元素已被删除 states.RemoveAt(states.Count - 1); diff --git a/FreeSql.DbContext/DbSet/DbSetAsync.cs b/FreeSql.DbContext/DbSet/DbSetAsync.cs index e4fbc75d..df1a2c00 100644 --- a/FreeSql.DbContext/DbSet/DbSetAsync.cs +++ b/FreeSql.DbContext/DbSet/DbSetAsync.cs @@ -20,7 +20,7 @@ namespace FreeSql return _db.ExecCommandAsync(); } - async Task DbContextBetchAddAsync(EntityState[] adds) + async Task DbContextBatchAddAsync(EntityState[] adds) { if (adds.Any() == false) return 0; var affrows = await this.OrmInsert(adds.Select(a => a.Value)).ExecuteAffrowsAsync(); @@ -303,9 +303,9 @@ namespace FreeSql #endregion #region UpdateAsync - Task DbContextBetchUpdateAsync(EntityState[] ups) => DbContextBetchUpdatePrivAsync(ups, false); - Task DbContextBetchUpdateNowAsync(EntityState[] ups) => DbContextBetchUpdatePrivAsync(ups, true); - async Task DbContextBetchUpdatePrivAsync(EntityState[] ups, bool isLiveUpdate) + Task DbContextBatchUpdateAsync(EntityState[] ups) => DbContextBatchUpdatePrivAsync(ups, false); + Task DbContextBatchUpdateNowAsync(EntityState[] ups) => DbContextBatchUpdatePrivAsync(ups, true); + async Task DbContextBatchUpdatePrivAsync(EntityState[] ups, bool isLiveUpdate) { if (ups.Any() == false) return 0; var uplst1 = ups[ups.Length - 1]; @@ -392,7 +392,7 @@ namespace FreeSql #endregion #region RemoveAsync - async Task DbContextBetchRemoveAsync(EntityState[] dels) + async Task DbContextBatchRemoveAsync(EntityState[] dels) { if (dels.Any() == false) return 0; var affrows = await this.OrmDelete(dels.Select(a => a.Value)).ExecuteAffrowsAsync(); diff --git a/FreeSql.DbContext/DbSet/DbSetSync.cs b/FreeSql.DbContext/DbSet/DbSetSync.cs index c2bbbbbd..172d13cb 100644 --- a/FreeSql.DbContext/DbSet/DbSetSync.cs +++ b/FreeSql.DbContext/DbSet/DbSetSync.cs @@ -19,7 +19,7 @@ namespace FreeSql _db.ExecCommand(); } - int DbContextBetchAdd(EntityState[] adds) + int DbContextBatchAdd(EntityState[] adds) { if (adds.Any() == false) return 0; var affrows = this.OrmInsert(adds.Select(a => a.Value)).ExecuteAffrows(); @@ -338,9 +338,9 @@ namespace FreeSql #endregion #region Update - int DbContextBetchUpdate(EntityState[] ups) => DbContextBetchUpdatePriv(ups, false); - int DbContextBetchUpdateNow(EntityState[] ups) => DbContextBetchUpdatePriv(ups, true); - int DbContextBetchUpdatePriv(EntityState[] ups, bool isLiveUpdate) + int DbContextBatchUpdate(EntityState[] ups) => DbContextBatchUpdatePriv(ups, false); + int DbContextBatchUpdateNow(EntityState[] ups) => DbContextBatchUpdatePriv(ups, true); + int DbContextBatchUpdatePriv(EntityState[] ups, bool isLiveUpdate) { if (ups.Any() == false) return 0; var uplst1 = ups[ups.Length - 1]; @@ -433,7 +433,7 @@ namespace FreeSql #endregion #region Remove - int DbContextBetchRemove(EntityState[] dels) + int DbContextBatchRemove(EntityState[] dels) { if (dels.Any() == false) return 0; var affrows = this.OrmDelete(dels.Select(a => a.Value)).ExecuteAffrows(); diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml index d9f91124..dc0203b8 100644 --- a/FreeSql.DbContext/FreeSql.DbContext.xml +++ b/FreeSql.DbContext/FreeSql.DbContext.xml @@ -110,13 +110,6 @@ 清空状态数据 - - - 根据 lambda 条件删除数据 - - - - 添加 diff --git a/FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerInsertTest.cs index c17a1113..c25d5c68 100644 --- a/FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerInsertTest.cs +++ b/FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerInsertTest.cs @@ -103,19 +103,19 @@ namespace FreeSql.Tests.SqlServer //items = Enumerable.Range(0, 9989).Select(a => new Topic { Title = "newtitle" + a, CreateTime = DateTime.Now }).ToList(); //Assert.Equal(9989, g.sqlserver.Insert(items).ExecuteAffrows()); - //var bttype = new TestBetchInsertType { title = "testbttitle1" }; + //var bttype = new TestBatchInsertType { title = "testbttitle1" }; //bttype.id = (int)g.sqlserver.Insert(bttype).ExecuteIdentity(); //Assert.True(bttype.id > 0); - //var bttopic = Enumerable.Range(0, 10000).Select(a => new TestBetchInsertTopic { TypeId = bttype.id, Text = $"testtopic{a}" }).ToArray(); - //Assert.Equal(bttopic.Length, g.sqlserver.Insert(bttopic).ExecuteAffrows()); + //var bttopic = Enumerable.Range(0, 10000).Select(a => new TestBatchInsertTopic { TypeId = bttype.id, Text = $"testtopic{a}" }).ToArray(); + //Assert.Equal(bttopic.Length, g.sqlserver.Insert(bttopic).ExecuteAffrows()); //g.sqlserver.Transaction(() => //{ - // bttype = new TestBetchInsertType { title = "transaction_testbttitle2" }; + // bttype = new TestBatchInsertType { title = "transaction_testbttitle2" }; // bttype.id = (int)g.sqlserver.Insert(bttype).ExecuteIdentity(); // Assert.True(bttype.id > 0); - // bttopic = Enumerable.Range(0, 10000).Select(a => new TestBetchInsertTopic { TypeId = bttype.id, Text = $"transaction_testtopic{a}" }).ToArray(); - // Assert.Equal(bttopic.Length, g.sqlserver.Insert(bttopic).ExecuteAffrows()); + // bttopic = Enumerable.Range(0, 10000).Select(a => new TestBatchInsertTopic { TypeId = bttype.id, Text = $"transaction_testtopic{a}" }).ToArray(); + // Assert.Equal(bttopic.Length, g.sqlserver.Insert(bttopic).ExecuteAffrows()); //}); g.sqlserver.Transaction(() => @@ -127,12 +127,12 @@ namespace FreeSql.Tests.SqlServer Assert.Equal(detail.Length, g.sqlserver.Insert(detail).NoneParameter().ExecuteAffrows()); }); } - class TestBetchInsertType { + class TestBatchInsertType { [Column(IsIdentity = true)] public int id { get; set; } public string title { get; set; } } - class TestBetchInsertTopic + class TestBatchInsertTopic { public Guid id { get; set; } public int TypeId { get; set; }