diff --git a/Src/Asp.Net/PgSqlTest/Demo/Demo1_Queryable.cs b/Src/Asp.Net/PgSqlTest/Demo/Demo1_Queryable.cs index 66ea8c0eb..66c0c5028 100644 --- a/Src/Asp.Net/PgSqlTest/Demo/Demo1_Queryable.cs +++ b/Src/Asp.Net/PgSqlTest/Demo/Demo1_Queryable.cs @@ -177,7 +177,8 @@ namespace OrmTest var list4 = db.Queryable() .Mapper(it => it.A, it => it.AId) - .Mapper(it => it.B, it => it.BId).ToList(); + .Mapper(it => it.B, it => it.BId) + .Where(it => it.A.Id == 1).ToList(); //Manual mode var result = db.Queryable().Take(10).Select().Mapper((itemModel, cache) => diff --git a/Src/Asp.Net/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLBuilder.cs b/Src/Asp.Net/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLBuilder.cs index a933f2323..eb42f8256 100644 --- a/Src/Asp.Net/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLBuilder.cs +++ b/Src/Asp.Net/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLBuilder.cs @@ -45,6 +45,11 @@ namespace SqlSugar } public override string GetTranslationColumnName(string propertyName) { + if (propertyName.Contains(".")&& !propertyName.Contains(SqlTranslationLeft)) + { + return string.Join(".", propertyName.Split('.').Select(it => $"{SqlTranslationLeft}{it.ToLower(isAutoToLower)}{SqlTranslationRight}")); + } + if (propertyName.Contains(SqlTranslationLeft)) return propertyName; else return SqlTranslationLeft + propertyName.ToLower(isAutoToLower) + SqlTranslationRight; diff --git a/Src/Asp.NetCore2/SqlSeverTest/PgSqlTest/Demo/Demo1_Queryable.cs b/Src/Asp.NetCore2/SqlSeverTest/PgSqlTest/Demo/Demo1_Queryable.cs index 3113645c2..431b16edb 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/PgSqlTest/Demo/Demo1_Queryable.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/PgSqlTest/Demo/Demo1_Queryable.cs @@ -168,7 +168,8 @@ namespace OrmTest var list4 = db.Queryable() .Mapper(it => it.A, it => it.AId) - .Mapper(it => it.B, it => it.BId).ToList(); + .Mapper(it => it.B, it => it.BId) + .Where(it=>it.A.Id==1).ToList(); //Manual mode var result = db.Queryable().Take(10).Select().Mapper((itemModel, cache) => diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLBuilder.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLBuilder.cs index a933f2323..eb42f8256 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLBuilder.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLBuilder.cs @@ -45,6 +45,11 @@ namespace SqlSugar } public override string GetTranslationColumnName(string propertyName) { + if (propertyName.Contains(".")&& !propertyName.Contains(SqlTranslationLeft)) + { + return string.Join(".", propertyName.Split('.').Select(it => $"{SqlTranslationLeft}{it.ToLower(isAutoToLower)}{SqlTranslationRight}")); + } + if (propertyName.Contains(SqlTranslationLeft)) return propertyName; else return SqlTranslationLeft + propertyName.ToLower(isAutoToLower) + SqlTranslationRight;