From 4b15cfb96fb1311e6ca837356b370890230820c2 Mon Sep 17 00:00:00 2001 From: 2881099 <2881099@qq.com> Date: Thu, 5 May 2022 12:21:52 +0800 Subject: [PATCH] v3.2.609 #609 #1091 #1092 --- Directory.Build.props | 2 +- FreeSql.DbContext/FreeSql.DbContext.xml | 11 +---------- .../Repository/Repository/BaseRepository.cs | 2 +- .../Repository/Repository/BaseRepositoryAsync.cs | 2 +- .../Repository/Repository/IBaseRepository.cs | 4 ++-- .../FreeSql.Tests.DbContext/RepositoryTests.cs | 8 ++++---- 6 files changed, 10 insertions(+), 19 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 3a84e60d..fe1dd8bf 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -9,7 +9,7 @@ - 3.2.608 + 3.2.609 diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml index eb0d0e63..38f8de9d 100644 --- a/FreeSql.DbContext/FreeSql.DbContext.xml +++ b/FreeSql.DbContext/FreeSql.DbContext.xml @@ -360,7 +360,7 @@ 实体对象 属性名 - + 根据设置的 OneToOne/OneToMany/ManyToMany 导航属性，级联查询所有的数据库记录，删除并返回它们 @@ -559,14 +559,5 @@ - - - 批量注入 Repository，可以参考代码自行调整 - - - - - - diff --git a/FreeSql.DbContext/Repository/Repository/BaseRepository.cs b/FreeSql.DbContext/Repository/Repository/BaseRepository.cs index 287ae219..2ce3a6a3 100644 --- a/FreeSql.DbContext/Repository/Repository/BaseRepository.cs +++ b/FreeSql.DbContext/Repository/Repository/BaseRepository.cs @@ -94,7 +94,7 @@ namespace FreeSql _dbset.RemoveRange(entitys); return _db.SaveChanges(); } - public List RemoveCascadeByDatabase(Expression> predicate) + public List DeleteCascadeByDatabase(Expression> predicate) { var list = _dbset.RemoveCascadeByDatabase(predicate); var affrows = _db.SaveChanges(); diff --git a/FreeSql.DbContext/Repository/Repository/BaseRepositoryAsync.cs b/FreeSql.DbContext/Repository/Repository/BaseRepositoryAsync.cs index 02a49839..c60dc03c 100644 --- a/FreeSql.DbContext/Repository/Repository/BaseRepositoryAsync.cs +++ b/FreeSql.DbContext/Repository/Repository/BaseRepositoryAsync.cs @@ -32,7 +32,7 @@ namespace FreeSql _dbset.RemoveRange(entitys); return _db.SaveChangesAsync(cancellationToken); } - async public virtual Task> RemoveCascadeByDatabaseAsync(Expression> predicate, CancellationToken cancellationToken = default) + async public virtual Task> DeleteCascadeByDatabaseAsync(Expression> predicate, CancellationToken cancellationToken = default) { var list = await _dbset.RemoveCascadeByDatabaseAsync(predicate, cancellationToken); var affrows = await _db.SaveChangesAsync(cancellationToken); diff --git a/FreeSql.DbContext/Repository/Repository/IBaseRepository.cs b/FreeSql.DbContext/Repository/Repository/IBaseRepository.cs index fa3c6fda..cecb57f8 100644 --- a/FreeSql.DbContext/Repository/Repository/IBaseRepository.cs +++ b/FreeSql.DbContext/Repository/Repository/IBaseRepository.cs @@ -90,7 +90,7 @@ namespace FreeSql /// /// /// - List RemoveCascadeByDatabase(Expression> predicate); + List DeleteCascadeByDatabase(Expression> predicate); /// /// 开始编辑数据，然后调用方法 EndEdit 分析出添加、修改、删除 SQL 语句进行执行 @@ -122,7 +122,7 @@ namespace FreeSql Task DeleteAsync(TEntity entity, CancellationToken cancellationToken = default); Task DeleteAsync(IEnumerable entitys, CancellationToken cancellationToken = default); Task DeleteAsync(Expression> predicate, CancellationToken cancellationToken = default); - Task> RemoveCascadeByDatabaseAsync(Expression> predicate, CancellationToken cancellationToken = default); + Task> DeleteCascadeByDatabaseAsync(Expression> predicate, CancellationToken cancellationToken = default); #endif } diff --git a/FreeSql.Tests/FreeSql.Tests.DbContext/RepositoryTests.cs b/FreeSql.Tests/FreeSql.Tests.DbContext/RepositoryTests.cs index 8c22404a..da9d1d2c 100644 --- a/FreeSql.Tests/FreeSql.Tests.DbContext/RepositoryTests.cs +++ b/FreeSql.Tests/FreeSql.Tests.DbContext/RepositoryTests.cs @@ -33,7 +33,7 @@ namespace FreeSql.Tests fsql.Delete().Where("1=1").ExecuteAffrows(); var user = new DeleteCascadeUser { Username = "admin01", Password = "pwd01", UserExt = new DeleteCascadeUserExt { Remark = "用户备注01" } }; userRepo.Insert(user); - var ret = userRepo.RemoveCascadeByDatabase(a => a.Id == user.Id); + var ret = userRepo.DeleteCascadeByDatabase(a => a.Id == user.Id); Assert.Equal(2, ret.Count); Assert.IsType(ret[0]); Assert.Equal(user.UserExt.UserId, (ret[0] as DeleteCascadeUserExt).UserId); @@ -64,7 +64,7 @@ namespace FreeSql.Tests fsql.Delete().Where("1=1").ExecuteAffrows(); user = new DeleteCascadeUser { Username = "admin01", Password = "pwd01", UserExt = new DeleteCascadeUserExt { Remark = "用户备注01" } }; userRepo.Insert(user); - ret = userextRepo.RemoveCascadeByDatabase(a => a.UserId == user.UserExt.UserId); + ret = userextRepo.DeleteCascadeByDatabase(a => a.UserId == user.UserExt.UserId); Assert.Equal(2, ret.Count); Assert.IsType(ret[1]); Assert.Equal(user.UserExt.UserId, (ret[1] as DeleteCascadeUserExt).UserId); @@ -112,7 +112,7 @@ namespace FreeSql.Tests Assert.Equal(group.Id, group.Users[0].GroupId); Assert.Equal(group.Id, group.Users[1].GroupId); Assert.Equal(group.Id, group.Users[2].GroupId); - ret = groupRepo.RemoveCascadeByDatabase(a => a.Id == group.Id); + ret = groupRepo.DeleteCascadeByDatabase(a => a.Id == group.Id); Assert.Equal(7, ret.Count); Assert.IsType(ret[0]); Assert.Equal(group.Users[0].UserExt.UserId, (ret[0] as DeleteCascadeUserExt).UserId); @@ -211,7 +211,7 @@ namespace FreeSql.Tests Assert.Equal(group.Id, group.Users[0].GroupId); Assert.Equal(group.Id, group.Users[1].GroupId); Assert.Equal(group.Id, group.Users[2].GroupId); - ret = groupRepo.RemoveCascadeByDatabase(a => a.Id == group.Id); + ret = groupRepo.DeleteCascadeByDatabase(a => a.Id == group.Id); Assert.Equal(18, ret.Count); Assert.IsType(ret[0]);