lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-05-07 14:18:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Synchronization code

Browse Source
This commit is contained in:
sunkaixuan 2023-08-12 17:45:34 +08:00
parent 75e6285a54
commit fe2d7f4f99
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -657,12 +657,18 @@ namespace SqlSugar
{ {
shortName = this.Builder.GetTranslationColumnName(shortName); shortName = this.Builder.GetTranslationColumnName(shortName);
} }
return string.Format( var result= string.Format(
this.JoinTemplate, this.JoinTemplate,
joinInfo.JoinType.ToString() + UtilConstants.Space, joinInfo.JoinType.ToString() + UtilConstants.Space,
Builder.GetTranslationTableName(name) + UtilConstants.Space, Builder.GetTranslationTableName(name) + UtilConstants.Space,
shortName + UtilConstants.Space + (TableWithString == SqlWith.Null|| isSubQuery ? " " : TableWithString), shortName + UtilConstants.Space + (TableWithString == SqlWith.Null|| isSubQuery ? " " : TableWithString),
joinInfo.JoinWhere); joinInfo.JoinWhere);
if (joinInfo.EntityType!=null&&this.Context.EntityMaintenance.GetEntityInfoWithAttr(joinInfo.EntityType).Discrimator.HasValue())
{
var entityInfo = this.Context.EntityMaintenance.GetEntityInfoWithAttr(joinInfo.EntityType);
result = $" {result} AND {shortName}.{UtilMethods.GetDiscrimator(entityInfo,this.Builder)}";
}
return result;
} }
public virtual void Clear() public virtual void Clear()
{ {

16
Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs
View File

@ -1312,6 +1312,22 @@ namespace SqlSugar
} }
} }
} }
internal static string GetDiscrimator(EntityInfo entityInfo,ISqlBuilder builer)
{
List<string> wheres = new List<string>();
if (entityInfo != null && entityInfo.Discrimator.HasValue())
{
Check.ExceptionEasy(!Regex.IsMatch(entityInfo.Discrimator, @"^(?:\w+:\w+)(?:,\w+:\w+)*$"), "The format should be type:cat for this type, and if there are multiple, it can be FieldName:cat,FieldName2:dog ", "格式错误应该是type:cat这种格式，如果是多个可以FieldName:cat,FieldName2:dog，不要有空格");
var array = entityInfo.Discrimator.Split(',');
foreach (var disItem in array)
{
var name = disItem.Split(':').First();
var value = disItem.Split(':').Last();
wheres.Add($"{builer.GetTranslationColumnName(name)}={value.ToSqlValue()} ");
}
}
return string.Join(" AND ", wheres);
}
} }
} }