mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-05-17 05:29:33 +08:00
Synchronization code
This commit is contained in:
parent
2a1b67a9a7
commit
3257316d17
@ -1519,6 +1519,15 @@ namespace SqlSugar
|
|||||||
{
|
{
|
||||||
result.ShortName = this.SqlBuilder.GetTranslationColumnName(result.ShortName);
|
result.ShortName = this.SqlBuilder.GetTranslationColumnName(result.ShortName);
|
||||||
}
|
}
|
||||||
|
if (this.EntityInfo.Type == result.EntityType&&this.QueryBuilder?.AsTables?.Count()==1)
|
||||||
|
{
|
||||||
|
var tableName = this.QueryBuilder.AsTables.First().Value;
|
||||||
|
if (tableName.EndsWith(" MergeTable ")&&tableName?.Trim()==this.QueryBuilder.GetTableNameString?.Trim())
|
||||||
|
{
|
||||||
|
this.QueryBuilder.MasterDbTableName = " (SELECT * FROM " + tableName + ")";
|
||||||
|
this.QueryBuilder.AsTables?.Clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
if (result.JoinIndex == 0)
|
if (result.JoinIndex == 0)
|
||||||
{
|
{
|
||||||
var firstPareamter = (express as LambdaExpression).Parameters.First();
|
var firstPareamter = (express as LambdaExpression).Parameters.First();
|
||||||
|
@ -958,6 +958,7 @@ namespace SqlSugar
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public virtual string MasterDbTableName { get; set; }
|
||||||
public virtual string GetTableNameString
|
public virtual string GetTableNameString
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
@ -981,6 +982,10 @@ namespace SqlSugar
|
|||||||
}
|
}
|
||||||
var result = Builder.GetTranslationTableName(name);
|
var result = Builder.GetTranslationTableName(name);
|
||||||
result += UtilConstants.Space;
|
result += UtilConstants.Space;
|
||||||
|
if (MasterDbTableName.HasValue())
|
||||||
|
{
|
||||||
|
result = MasterDbTableName;
|
||||||
|
}
|
||||||
if (IsSingle() && result.Contains("MergeTable") && result.Trim().EndsWith(" MergeTable") && TableShortName != null)
|
if (IsSingle() && result.Contains("MergeTable") && result.Trim().EndsWith(" MergeTable") && TableShortName != null)
|
||||||
{
|
{
|
||||||
result = result.Replace(") MergeTable ", ") " + TableShortName+UtilConstants.Space);
|
result = result.Replace(") MergeTable ", ") " + TableShortName+UtilConstants.Space);
|
||||||
|
Loading…
Reference in New Issue
Block a user