lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-12-26 22:25:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Synchronization code

Browse Source
This commit is contained in:
sunkaixuan
2023-01-19 21:40:04 +08:00
parent 8767a845f0
commit ec36ab79f1
6 changed files with 52 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Asp.Net/SqlSugar/Abstract/FilterProvider/FilterProvider.cs
View File

@@ -65,7 +65,7 @@ namespace SqlSugar
}
}
public QueryFilterProvider AddTableFilter<T>(Expression<Func<T,bool>> expression, FilterJoinPosition filterJoinType = FilterJoinPosition.On) where T : class,new()
public QueryFilterProvider AddTableFilter<T>(Expression<Func<T,bool>> expression, FilterJoinPosition filterJoinType = FilterJoinPosition.On)
{
var isOn = filterJoinType == FilterJoinPosition.On;
var tableFilter = new TableFilterItem<T>(expression, isOn);

1
Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs
View File

@@ -1078,6 +1078,7 @@ namespace SqlSugar
JoinType = joinType,
JoinWhere = expResult.GetResultString(),
ShortName = lastPareamter.Name,
EntityType= lastPareamter.Type,
TableName = this.Context.EntityMaintenance.GetTableName(lastPareamter.Type)
};
if (this.Context.CurrentConnectionConfig?.MoreSettings?.PgSqlIsAutoToLower == false)

52
Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs
View File

@@ -390,7 +390,7 @@ namespace SqlSugar
Type ChildType = type.GetProperty("type", flag).GetValue(item, null) as Type;
var entityInfo = this.Context.EntityMaintenance.GetEntityInfo(ChildType);
var exp = field.GetValue(item, null) as Expression;
var isMain = ChildType == this.EntityType;
var isMain = ChildType == this.EntityType||(ChildType.IsInterface&& this.EntityType.GetInterfaces().Any(it => it == ChildType));
var isSingle = IsSingle();
var itName = (exp as LambdaExpression).Parameters[0].Name;
itName = this.Builder.GetTranslationColumnName(itName) + ".";
@@ -399,11 +399,20 @@ namespace SqlSugar
string sql = "";
if (isSingle)
{
if (ChildType != this.EntityType && isSingle)
if (ChildType.IsInterface&&this.EntityType.GetInterfaces().Any(it => it == ChildType))
{
//future
}
else if (ChildType != this.EntityType && isSingle)
{
return;
}
}
sql = GetSql(exp, isSingle);
if (ChildType.IsInterface)
{
var filterType = this.EntityType;
sql = ReplaceFilterColumnName(sql, filterType);
}
}
else if (isMain)
{
@@ -427,6 +436,11 @@ namespace SqlSugar
sql = GetSql(exp, isSingle);
sql = sql.Replace(itName, shortName);
}
if (ChildType.IsInterface)
{
sql = ReplaceFilterColumnName(sql, this.EntityType);
}
}
else if (isEasyJoin)
{
@@ -448,7 +462,14 @@ namespace SqlSugar
it.TableName.Equals(entityInfo.EntityName, StringComparison.CurrentCultureIgnoreCase));
if (easyInfo == null)
{
return;
if (ChildType.IsInterface && JoinQueryInfos.Any(it => it.EntityType.GetInterfaces().Any(z => z == ChildType)))
{
easyInfo = JoinQueryInfos.FirstOrDefault(it => it.EntityType.GetInterfaces().Any(z => z == ChildType));
}
else
{
return;
}
}
var shortName = this.Builder.GetTranslationColumnName(easyInfo.ShortName.Trim()) + ".";
sql = GetSql(exp, isSingle);
@@ -463,7 +484,8 @@ namespace SqlSugar
var isSameName = !isSingle && this.JoinQueryInfos.Count(it => it.TableName == entityInfo.DbTableName) > 1;
foreach (var joinInfo in this.JoinQueryInfos)
{
if (joinInfo.TableName.EqualCase(entityInfo.EntityName)|| joinInfo.TableName.EqualCase(entityInfo.DbTableName))
var isInterface = ChildType.IsInterface && joinInfo.EntityType != null && joinInfo.EntityType.GetInterfaces().Any(it => it == ChildType);
if (isInterface||joinInfo.TableName.EqualCase(entityInfo.EntityName)|| joinInfo.TableName.EqualCase(entityInfo.DbTableName))
{
var mysql = sql;
if (isSameName)
@@ -475,12 +497,32 @@ namespace SqlSugar
{
mysql = Regex.Replace(mysql, $"^ WHERE ", " AND ");
}
if (isInterface)
{
mysql = ReplaceFilterColumnName(mysql,joinInfo.EntityType,Builder.GetTranslationColumnName(joinInfo.ShortName));
}
joinInfo.JoinWhere=joinInfo.JoinWhere + mysql;
}
}
}
}
private string ReplaceFilterColumnName(string sql, Type filterType,string shortName=null)
{
foreach (var column in this.Context.EntityMaintenance.GetEntityInfo(filterType).Columns.Where(it => it.IsIgnore == false))
{
if (shortName == null)
{
sql = sql.Replace(Builder.GetTranslationColumnName(column.PropertyName), Builder.GetTranslationColumnName(column.DbColumnName));
}
else
{
sql = sql.Replace(shortName + "."+Builder.GetTranslationColumnName(column.PropertyName), shortName+"." +Builder.GetTranslationColumnName(column.DbColumnName));
}
}
return sql;
}
private string GetSql(Expression exp, bool isSingle)
{
var expValue = GetExpressionValue(exp, isSingle ? ResolveExpressType.WhereSingle : ResolveExpressType.WhereMultiple);

1
Src/Asp.Net/SqlSugar/Abstract/SugarProvider/SqlSugarAccessory.cs
View File

@@ -327,6 +327,7 @@ namespace SqlSugar
string shortName = string.Empty;
List<SugarParameter> paramters = new List<SugarParameter>();
queryable.SqlBuilder.QueryBuilder.JoinQueryInfos = this.GetJoinInfos(queryable.SqlBuilder, joinExpression, ref paramters, ref shortName, types);
queryable.SqlBuilder.QueryBuilder.JoinQueryInfos.Last().EntityType = types.Last();
queryable.SqlBuilder.QueryBuilder.TableShortName = shortName;
queryable.SqlBuilder.QueryBuilder.JoinExpression = joinExpression;
if (paramters != null)

1
Src/Asp.Net/SqlSugar/Entities/JoinQueryInfo.cs
View File

@@ -14,6 +14,7 @@ namespace SqlSugar
public string ShortName { get; set; }
public int JoinIndex { get; set; }
public string JoinWhere { get; set; }
public Type EntityType { get; set; }
}
public class JoinQueryInfos
{

2
Src/Asp.Net/SqlSugar/Entities/SqlFilter.cs
View File

@@ -19,7 +19,7 @@ namespace SqlSugar
public bool IsJoinQuery { get; set; }
}
public class TableFilterItem<T>: SqlFilterItem where T :class,new()
public class TableFilterItem<T>: SqlFilterItem
{
private TableFilterItem()
{