v3.2.609 #609 #1091 #1092

Author: 2881099

Directory.Build.props

@@ -9,7 +9,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<Version>3.2.608</Version>
+		<Version>3.2.609</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

FreeSql.DbContext/FreeSql.DbContext.xml

@@ -94,7 +94,7 @@ public virtual int Delete(IEnumerable<TEntity> entitys)
             _dbset.RemoveRange(entitys);
             return _db.SaveChanges();
         }
-        public List<object> RemoveCascadeByDatabase(Expression<Func<TEntity, bool>> predicate)
+        public List<object> DeleteCascadeByDatabase(Expression<Func<TEntity, bool>> predicate)
         {
             var list = _dbset.RemoveCascadeByDatabase(predicate);
             var affrows = _db.SaveChanges();

FreeSql.DbContext/Repository/Repository/BaseRepository.cs

@@ -32,7 +32,7 @@ public virtual Task<int> DeleteAsync(IEnumerable<TEntity> entitys, CancellationT
             _dbset.RemoveRange(entitys);
             return _db.SaveChangesAsync(cancellationToken);
         }
-        async public virtual Task<List<object>> RemoveCascadeByDatabaseAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default)
+        async public virtual Task<List<object>> DeleteCascadeByDatabaseAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default)
         {
             var list = await _dbset.RemoveCascadeByDatabaseAsync(predicate, cancellationToken);
             var affrows = await _db.SaveChangesAsync(cancellationToken);

FreeSql.DbContext/Repository/Repository/BaseRepositoryAsync.cs

@@ -90,7 +90,7 @@ public interface IBaseRepository<TEntity> : IBaseRepository
         /// </summary>
         /// <param name="predicate"></param>
         /// <returns></returns>
-        List<object> RemoveCascadeByDatabase(Expression<Func<TEntity, bool>> predicate);
+        List<object> DeleteCascadeByDatabase(Expression<Func<TEntity, bool>> predicate);
 
         /// <summary>
         /// 开始编辑数据，然后调用方法 EndEdit 分析出添加、修改、删除 SQL 语句进行执行<para></para>
@@ -122,7 +122,7 @@ public interface IBaseRepository<TEntity> : IBaseRepository
         Task<int> DeleteAsync(TEntity entity, CancellationToken cancellationToken = default);
         Task<int> DeleteAsync(IEnumerable<TEntity> entitys, CancellationToken cancellationToken = default);
         Task<int> DeleteAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default);
-        Task<List<object>> RemoveCascadeByDatabaseAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default);
+        Task<List<object>> DeleteCascadeByDatabaseAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default);
 #endif
     }
 

FreeSql.DbContext/Repository/Repository/IBaseRepository.cs

@@ -33,7 +33,7 @@ public void DeleteCascade()
             fsql.Delete<DeleteCascadeUserExt>().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<DeleteCascadeUserExt>(ret[0]);
             Assert.Equal(user.UserExt.UserId, (ret[0] as DeleteCascadeUserExt).UserId);
@@ -64,7 +64,7 @@ public void DeleteCascade()
             fsql.Delete<DeleteCascadeUserExt>().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<DeleteCascadeUserExt>(ret[1]);
             Assert.Equal(user.UserExt.UserId, (ret[1] as DeleteCascadeUserExt).UserId);
@@ -112,7 +112,7 @@ public void DeleteCascade()
             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<DeleteCascadeUserExt>(ret[0]);
             Assert.Equal(group.Users[0].UserExt.UserId, (ret[0] as DeleteCascadeUserExt).UserId);
@@ -211,7 +211,7 @@ public void DeleteCascade()
             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<DeleteCascadeUserExt>(ret[0]);