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

Synchronization code

Browse Source
This commit is contained in:
sunkaixuan 2024-01-06 22:33:40 +08:00
parent 6a122c7336
commit 6ee18ff5f1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
View File

@ -40,7 +40,7 @@ namespace SqlSugar
var shortName = $"pnv_{navObjectName}"; var shortName = $"pnv_{navObjectName}";
var mainShortName = memberExpression.Expression.ToString(); var mainShortName = memberExpression.Expression.ToString();
this.QueryBuilder.TableShortName = mainShortName; this.QueryBuilder.TableShortName = mainShortName;
var onWhere = $"{shortName}.{navPkColumn.DbColumnName}={mainShortName}.{navColumn.DbColumnName}"; var onWhere = $"{SqlBuilder.GetTranslationColumnName(shortName)}.{SqlBuilder.GetTranslationColumnName(navPkColumn.DbColumnName)}={SqlBuilder.GetTranslationColumnName(mainShortName)}.{SqlBuilder.GetTranslationColumnName(navColumn.DbColumnName)}";
UtilMethods.IsNullReturnNew(this.Context.TempItems); UtilMethods.IsNullReturnNew(this.Context.TempItems);
this.AddJoinInfo(GetTableName(navEntityInfo, navEntityInfo.DbTableName), shortName, onWhere, JoinType.Left); this.AddJoinInfo(GetTableName(navEntityInfo, navEntityInfo.DbTableName), shortName, onWhere, JoinType.Left);
this.QueryBuilder.JoinQueryInfos.Last().EntityType = navEntityInfo.Type; this.QueryBuilder.JoinQueryInfos.Last().EntityType = navEntityInfo.Type;
@ -56,7 +56,7 @@ namespace SqlSugar
var shortName = $"pnv_{navObjectName}"; var shortName = $"pnv_{navObjectName}";
var mainShortName = memberExpression.Expression.ToString(); var mainShortName = memberExpression.Expression.ToString();
this.QueryBuilder.TableShortName = mainShortName; this.QueryBuilder.TableShortName = mainShortName;
var onWhere = $"{shortName}.{navPkColumn.DbColumnName}={mainShortName}.{navColumn.DbColumnName}"; var onWhere = $"{SqlBuilder.GetTranslationColumnName(shortName)}.{SqlBuilder.GetTranslationColumnName(navPkColumn.DbColumnName)}={SqlBuilder.GetTranslationColumnName(mainShortName)}.{SqlBuilder.GetTranslationColumnName(navColumn.DbColumnName)}";
UtilMethods.IsNullReturnNew(this.Context.TempItems); UtilMethods.IsNullReturnNew(this.Context.TempItems);
this.AddJoinInfo(GetTableName(navEntityInfo, navEntityInfo.DbTableName), shortName, onWhere, JoinType.Inner); this.AddJoinInfo(GetTableName(navEntityInfo, navEntityInfo.DbTableName), shortName, onWhere, JoinType.Inner);
this.QueryBuilder.JoinQueryInfos.Last().EntityType = navEntityInfo.Type; this.QueryBuilder.JoinQueryInfos.Last().EntityType = navEntityInfo.Type;
@ -72,7 +72,7 @@ namespace SqlSugar
var shortName = $"pnv_{navObjectName}"; var shortName = $"pnv_{navObjectName}";
var mainShortName = memberExpression.Expression.ToString(); var mainShortName = memberExpression.Expression.ToString();
this.QueryBuilder.TableShortName = mainShortName; this.QueryBuilder.TableShortName = mainShortName;
var onWhere = $"{shortName}.{navPkColumn.DbColumnName}={mainShortName}.{navColumn.DbColumnName}"; var onWhere = $"{SqlBuilder.GetTranslationColumnName(shortName)}.{SqlBuilder.GetTranslationColumnName(navPkColumn.DbColumnName)}={SqlBuilder.GetTranslationColumnName(mainShortName)}.{SqlBuilder.GetTranslationColumnName(navColumn.DbColumnName)}";
UtilMethods.IsNullReturnNew(this.Context.TempItems); UtilMethods.IsNullReturnNew(this.Context.TempItems);
this.AddJoinInfo(GetTableName(navEntityInfo, navEntityInfo.DbTableName), shortName, onWhere, JoinType.Full); this.AddJoinInfo(GetTableName(navEntityInfo, navEntityInfo.DbTableName), shortName, onWhere, JoinType.Full);
this.QueryBuilder.JoinQueryInfos.Last().EntityType = navEntityInfo.Type; this.QueryBuilder.JoinQueryInfos.Last().EntityType = navEntityInfo.Type;
@ -88,7 +88,7 @@ namespace SqlSugar
var shortName = $"pnv_{navObjectName}"; var shortName = $"pnv_{navObjectName}";
var mainShortName = memberExpression.Expression.ToString(); var mainShortName = memberExpression.Expression.ToString();
this.QueryBuilder.TableShortName = mainShortName; this.QueryBuilder.TableShortName = mainShortName;
var onWhere = $"{shortName}.{navPkColumn.DbColumnName}={mainShortName}.{navColumn.DbColumnName}"; var onWhere = $"{SqlBuilder.GetTranslationColumnName(shortName)}.{SqlBuilder.GetTranslationColumnName(navPkColumn.DbColumnName)}={SqlBuilder.GetTranslationColumnName(mainShortName)}.{SqlBuilder.GetTranslationColumnName(navColumn.DbColumnName)}";
UtilMethods.IsNullReturnNew(this.Context.TempItems); UtilMethods.IsNullReturnNew(this.Context.TempItems);
this.AddJoinInfo(GetTableName(navEntityInfo, navEntityInfo.DbTableName), shortName, onWhere, JoinType.Right); this.AddJoinInfo(GetTableName(navEntityInfo, navEntityInfo.DbTableName), shortName, onWhere, JoinType.Right);
this.QueryBuilder.JoinQueryInfos.Last().EntityType = navEntityInfo.Type; this.QueryBuilder.JoinQueryInfos.Last().EntityType = navEntityInfo.Type;

2
Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/MemberExpressionResolve.cs
View File

@ -284,7 +284,7 @@ namespace SqlSugar
if (joinInfo != null) if (joinInfo != null)
{ {
var columnInfo = nav.ProPertyEntity.Columns.FirstOrDefault(it => it.PropertyName == nav.MemberName); var columnInfo = nav.ProPertyEntity.Columns.FirstOrDefault(it => it.PropertyName == nav.MemberName);
var value = new MapperSql() { Sql = joinInfo.ShortName + "." + columnInfo.DbColumnName }; var value = new MapperSql() { Sql = querybuilder.Builder.GetTranslationColumnName(joinInfo.ShortName) + "." + querybuilder.Builder.GetTranslationColumnName(columnInfo.DbColumnName) };
if (isSetTempData) if (isSetTempData)
{ {