lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-09-19 10:08:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update .net core

Browse Source
This commit is contained in:
sunkaixuan
2022-06-27 22:18:07 +08:00
parent b7d3e337aa
commit 8710fb1276
12 changed files with 227 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Src/Asp.NetCore2/SqlSugar/Abstract/ExecuteNavProvider/DeleteNavProvider.cs Normal file
View File

@@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Text;
using System.Threading.Tasks;
namespace SqlSugar
{
public class DeleteNavProvider<Root,T>
{
public List<Root> Roots { get; set; }
public DeleteNavProvider<Root,TChild> ThenInclude<TChild>(Expression<Func<T,TChild>> expression)
{
return null;
}
public DeleteNavProvider<Root,Root> AsNav()
{
return null;
}
}
}

25
Src/Asp.NetCore2/SqlSugar/Abstract/ExecuteNavProvider/InsertNavProvider.cs Normal file
View File

@@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Text;
using System.Threading.Tasks;
namespace SqlSugar
{
public class InsertNavProvider<Root,T>
{
public List<Root> Roots { get; set; }
public InsertNavProvider<Root,TChild> ThenInclude<TChild>(Expression<Func<T,TChild>> expression)
{
return null;
}
public InsertNavProvider<Root,Root> AsNav()
{
return null;
}
}
}

25
Src/Asp.NetCore2/SqlSugar/Abstract/ExecuteNavProvider/UpdateInsert.cs Normal file
View File

@@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Text;
using System.Threading.Tasks;
namespace SqlSugar
{
public class UpdateNavProvider<Root,T>
{
public List<Root> Roots { get; set; }
public UpdateNavProvider<Root,TChild> ThenInclude<TChild>(Expression<Func<T,TChild>> expression)
{
return null;
}
public UpdateNavProvider<Root,Root> AsNav()
{
return null;
}
}
}

12
Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/NavigatManager.cs
View File

@@ -294,7 +294,11 @@ namespace SqlSugar
var navEntityInfo = this.Context.EntityMaintenance.GetEntityInfo(navType);
this.Context.InitMappingInfo(navEntityInfo.Type);
var navPkColumn = navEntityInfo.Columns.Where(it => it.IsPrimarykey).FirstOrDefault();
Check.ExceptionEasy(navPkColumn==null, navEntityInfo.EntityName+ "need primarykey", navEntityInfo.EntityName + " 需要主键");
Check.ExceptionEasy(navPkColumn==null&& navObjectNameColumnInfo.Navigat.Name2==null, navEntityInfo.EntityName+ "need primarykey", navEntityInfo.EntityName + " 需要主键");
if (navPkColumn==null)
{
navPkColumn = navEntityInfo.Columns.Where(it => it.PropertyName== navObjectNameColumnInfo.Navigat.Name2).FirstOrDefault();
}
var ids = list.Select(it => it.GetType().GetProperty(navObjectNameColumnInfo.Navigat.Name).GetValue(it)).Select(it => it == null ? "null" : it).Distinct().ToList();
List<IConditionalModel> conditionalModels = new List<IConditionalModel>();
conditionalModels.Add((new ConditionalModel()
@@ -336,7 +340,11 @@ namespace SqlSugar
Check.ExceptionEasy(navColumn == null, $"{navEntityInfo.EntityName} not found {navObjectNameColumnInfo.Navigat.Name} ", $"实体 {navEntityInfo.EntityName} 未找到导航配置列 {navObjectNameColumnInfo.Navigat.Name} ");
//var navType = navObjectNamePropety.PropertyType;
var listItemPkColumn = listItemEntity.Columns.Where(it => it.IsPrimarykey).FirstOrDefault();
Check.ExceptionEasy(listItemPkColumn == null, listItemEntity.EntityName + " not primary key", listItemEntity.EntityName + "没有主键");
Check.ExceptionEasy(listItemPkColumn == null&& navObjectNameColumnInfo.Navigat.Name2==null, listItemEntity.EntityName + " not primary key", listItemEntity.EntityName + "没有主键");
if (listItemPkColumn == null)
{
listItemPkColumn = listItemEntity.Columns.Where(it => it.PropertyName== navObjectNameColumnInfo.Navigat.Name2).FirstOrDefault();
}
var ids = list.Select(it => it.GetType().GetProperty(listItemPkColumn.PropertyName).GetValue(it)).Select(it => it == null ? "null" : it).Distinct().ToList();
List<IConditionalModel> conditionalModels = new List<IConditionalModel>();
conditionalModels.Add((new ConditionalModel()

33
Src/Asp.NetCore2/SqlSugar/Abstract/SugarProvider/SqlSugarProvider.cs
View File

@@ -889,6 +889,39 @@ namespace SqlSugar
}
#endregion
#region Nav CUD
public InsertNavProvider<T, T> InsertNav<T>(T data)
{
return InsertNav(new List<T>() { data });
}
public InsertNavProvider<T, T> InsertNav<T>(List<T> datas)
{
var result = new InsertNavProvider<T, T>();
result.Roots = datas;
return result;
}
public DeleteNavProvider<T, T> DeleteNav<T>(T data)
{
return DeleteNav(new List<T>() { data });
}
public DeleteNavProvider<T, T> DeleteNav<T>(List<T> datas)
{
var result = new DeleteNavProvider<T, T>();
result.Roots = datas;
return result;
}
public UpdateNavProvider<T, T> UpdateNav<T>(T data)
{
return UpdateNav(new List<T>() { data });
}
public UpdateNavProvider<T, T> UpdateNav<T>(List<T> datas)
{
var result = new UpdateNavProvider<T, T>();
result.Roots = datas;
return result;
}
#endregion
#region DbFirst
public virtual IDbFirst DbFirst
{

24
Src/Asp.NetCore2/SqlSugar/Abstract/SugarProvider/SqlSugarScopeProvider.cs
View File

@@ -678,6 +678,30 @@ namespace SqlSugar
{
return ScopedContext.Saveable(saveObject);
}
public InsertNavProvider<T, T> InsertNav<T>(T data)
{
return ScopedContext.InsertNav(data);
}
public InsertNavProvider<T, T> InsertNav<T>(List<T> datas)
{
return ScopedContext.InsertNav(datas);
}
public DeleteNavProvider<T, T> DeleteNav<T>(T data)
{
return ScopedContext.DeleteNav(data);
}
public DeleteNavProvider<T, T> DeleteNav<T>(List<T> datas)
{
return ScopedContext.DeleteNav(datas);
}
public UpdateNavProvider<T, T> UpdateNav<T>(T data)
{
return ScopedContext.UpdateNav(data);
}
public UpdateNavProvider<T, T> UpdateNav<T>(List<T> datas)
{
return ScopedContext.UpdateNav(datas);
}
#endregion
}
}

7
Src/Asp.NetCore2/SqlSugar/Entities/Mapping/SugarMappingAttribute.cs
View File

@@ -215,6 +215,7 @@ namespace SqlSugar
public class Navigate: Attribute
{
public string Name { get; set; }
public string Name2 { get; set; }
public Type MappingType { get; set; }
public string MappingAId { get; set; }
public string MappingBId { get; set; }
@@ -224,6 +225,12 @@ namespace SqlSugar
this.Name = name;
this.NavigatType = navigatType;
}
public Navigate(NavigateType navigatType, string firstName,string lastName)
{
this.Name = firstName;
this.Name2 = lastName;
this.NavigatType = navigatType;
}
public Navigate(Type MappingTableType,string typeAiD,string typeBId)
{
this.MappingType = MappingTableType;

4
Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/OneToManyNavgateExpression.cs
View File

@@ -168,6 +168,10 @@ namespace SqlSugar
private MapperSql GetOneToManySql()
{
var pkColumn = this.EntityInfo.Columns.FirstOrDefault(it => it.IsPrimarykey == true);
if (pkColumn == null && Navigat.Name2 != null)
{
pkColumn = this.EntityInfo.Columns.FirstOrDefault(it => it.PropertyName== Navigat.Name2);
}
Check.ExceptionEasy(pkColumn == null, $"{this.EntityInfo.EntityName} need primary key ",
$"导航属性 {this.EntityInfo.EntityName}需要主键");
var pk = pkColumn.DbColumnName;

13
Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/OneToOneNavgateExpression.cs
View File

@@ -77,7 +77,18 @@ namespace SqlSugar
" NavigateType.Dynamic no support expression . "+ this.ProPertyEntity.Type.Name,
" NavigateType.Dynamic 自定义导航对象不支持在Where(x=>x.自定义.Id==1)等方法中使用"+ this.ProPertyEntity.Type.Name);
}
var pk = this.ProPertyEntity.Columns.First(it => it.IsPrimarykey == true).DbColumnName;
var pk = this.ProPertyEntity.Columns.FirstOrDefault(it => it.IsPrimarykey == true)?.DbColumnName;
if (pk == null && Navigat.Name2 != null)
{
pk = this.ProPertyEntity.Columns.FirstOrDefault(it => it.PropertyName == Navigat.Name2)?.DbColumnName;
}
if(pk==null)
{
Check.ExceptionEasy(
true,
$"{this.ProPertyEntity.EntityName} naviate config error",
$"{this.ProPertyEntity.EntityName} 导航配置错误");
}
var name = this.EntityInfo.Columns.First(it => it.PropertyName == Navigat.Name).DbColumnName;
var selectName = this.ProPertyEntity.Columns.First(it => it.PropertyName ==MemberName).DbColumnName;
MapperSql mapper = new MapperSql();

9
Src/Asp.NetCore2/SqlSugar/Interface/ISqlSugarClient.cs
View File

@@ -202,5 +202,14 @@ namespace SqlSugar
Task ThenMapperAsync<T>(IEnumerable<T> list, Func<T,Task> action);
#endregion
#region Nav CUD
InsertNavProvider<T, T> InsertNav<T>(T data);
InsertNavProvider<T, T> InsertNav<T>(List<T> datas);
DeleteNavProvider<T, T> DeleteNav<T>(T data);
DeleteNavProvider<T, T> DeleteNav<T>(List<T> datas);
UpdateNavProvider<T, T> UpdateNav<T>(T data);
UpdateNavProvider<T, T> UpdateNav<T>(List<T> datas);
#endregion
}
}

27
Src/Asp.NetCore2/SqlSugar/SqlSugarClient.cs
View File

@@ -153,6 +153,33 @@ namespace SqlSugar
#region Queryable
#region Nav CUD
public InsertNavProvider<T, T> InsertNav<T>(T data)
{
return this.Context.InsertNav(data);
}
public InsertNavProvider<T, T> InsertNav<T>(List<T> datas)
{
return this.Context.InsertNav(datas);
}
public DeleteNavProvider<T, T> DeleteNav<T>(T data)
{
return this.Context.DeleteNav(data);
}
public DeleteNavProvider<T, T> DeleteNav<T>(List<T> datas)
{
return this.Context.DeleteNav(datas);
}
public UpdateNavProvider<T, T> UpdateNav<T>(T data)
{
return this.Context.UpdateNav(data);
}
public UpdateNavProvider<T, T> UpdateNav<T>(List<T> datas)
{
return this.Context.UpdateNav(datas);
}
#endregion
#region Union
public ISugarQueryable<T> Union<T>(List<ISugarQueryable<T>> queryables) where T : class, new()
{

26
Src/Asp.NetCore2/SqlSugar/SqlSugarScope.cs
View File

@@ -723,5 +723,31 @@ namespace SqlSugar
{
return ScopedContext.DeleteableWithAttr<T>(deleteObjs);
}
public InsertNavProvider<T, T> InsertNav<T>(T data)
{
return ScopedContext.InsertNav(data);
}
public InsertNavProvider<T, T> InsertNav<T>(List<T> datas)
{
return ScopedContext.InsertNav(datas);
}
public DeleteNavProvider<T, T> DeleteNav<T>(T data)
{
return ScopedContext.DeleteNav(data);
}
public DeleteNavProvider<T, T> DeleteNav<T>(List<T> datas)
{
return ScopedContext.DeleteNav(datas);
}
public UpdateNavProvider<T, T> UpdateNav<T>(T data)
{
return ScopedContext.UpdateNav(data);
}
public UpdateNavProvider<T, T> UpdateNav<T>(List<T> datas)
{
return ScopedContext.UpdateNav(datas);
}
}
}