tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-11-04 17:20:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 优化 延时导航属性的错误提醒，当无法匹配错误，转到重写类 get 时抛出（实现延时导航属性，与普通导航一起使用）；

Browse Source
This commit is contained in:
28810
2019-05-21 10:39:35 +08:00
parent 98d120120b
commit 5a69128807
3 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FreeSql/FreeSql.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<Version>0.5.21</Version> <Version>0.5.22</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>YeXiangQin</Authors> <Authors>YeXiangQin</Authors>
<Description>FreeSql is the most convenient ORM in dotnet. It supports Mysql, Postgresql, SqlServer, Oracle and Sqlite.</Description> <Description>FreeSql is the most convenient ORM in dotnet. It supports Mysql, Postgresql, SqlServer, Oracle and Sqlite.</Description>

3
FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
View File

@@ -704,7 +704,8 @@ namespace FreeSql.Internal.CommonProvider {
Expression.Add(dataIndexExp, Expression.Constant(1)) Expression.Add(dataIndexExp, Expression.Constant(1))
); );
else { else {
readExpAssign = Expression.Call(Utils.MethodExecuteArrayRowReadClassOrTuple, new Expression[] { Expression.Constant(null, typeof(string)), Expression.Constant(prop.PropertyType), Expression.Constant(null, typeof(int[])), rowExp, dataIndexExp, Expression.Constant(_commonUtils) }); var propLazyType = _commonUtils.GetTableByEntity(prop.PropertyType)?.TypeLazy ?? prop.PropertyType;
readExpAssign = Expression.Call(Utils.MethodExecuteArrayRowReadClassOrTuple, new Expression[] { Expression.Constant(null, typeof(string)), Expression.Constant(propLazyType), Expression.Constant(null, typeof(int[])), rowExp, dataIndexExp, Expression.Constant(_commonUtils) });
} }
} }
blockExp.AddRange(new Expression[] { blockExp.AddRange(new Expression[] {

42
FreeSql/Internal/UtilsExpressionTree.cs
View File

@@ -467,13 +467,13 @@ namespace FreeSql.Internal {
if (trycol != null && trycol.CsType.NullableTypeOrThis() != trytb.Primarys[a].CsType) { if (trycol != null && trycol.CsType.NullableTypeOrThis() != trytb.Primarys[a].CsType) {
nvref.Exception = new Exception($"【OneToMany】导航属性 {trytbTypeName}.{pnv.Name} 解析错误，{trytb.CsName}.{trytb.Primarys[a].CsName} 和 {tbref.CsName}.{trycol.CsName} 类型不一致"); nvref.Exception = new Exception($"【OneToMany】导航属性 {trytbTypeName}.{pnv.Name} 解析错误，{trytb.CsName}.{trytb.Primarys[a].CsName} 和 {tbref.CsName}.{trycol.CsName} 类型不一致");
trytb.AddOrUpdateTableRef(pnv.Name, nvref); trytb.AddOrUpdateTableRef(pnv.Name, nvref);
if (isLazy) throw nvref.Exception; //if (isLazy) throw nvref.Exception;
continue; continue;
} }
if (trycol == null) { if (trycol == null) {
nvref.Exception = new Exception($"【OneToMany】导航属性 {trytbTypeName}.{pnv.Name} 在 {tbref.CsName} 中没有找到对应的字段，如：{findtrytb}{findtrytbPkCsName}、{findtrytb}_{findtrytbPkCsName}" + (refprop == null ? "" : $"、{refprop.Name}{findtrytbPkCsName}、{refprop.Name}_{findtrytbPkCsName}")); nvref.Exception = new Exception($"【OneToMany】导航属性 {trytbTypeName}.{pnv.Name} 在 {tbref.CsName} 中没有找到对应的字段，如：{findtrytb}{findtrytbPkCsName}、{findtrytb}_{findtrytbPkCsName}" + (refprop == null ? "" : $"、{refprop.Name}{findtrytbPkCsName}、{refprop.Name}_{findtrytbPkCsName}"));
trytb.AddOrUpdateTableRef(pnv.Name, nvref); trytb.AddOrUpdateTableRef(pnv.Name, nvref);
if (isLazy) throw nvref.Exception; //if (isLazy) throw nvref.Exception;
continue; continue;
} }
} }
@@ -481,7 +481,7 @@ namespace FreeSql.Internal {
nvref.Columns.Add(trytb.Primarys[a]); nvref.Columns.Add(trytb.Primarys[a]);
nvref.RefColumns.Add(trycol); nvref.RefColumns.Add(trycol);
if (isLazy) { if (isLazy && nvref.Exception == null) {
if (a > 0) lmbdWhere.Append(" && "); if (a > 0) lmbdWhere.Append(" && ");
lmbdWhere.Append("a.").Append(trycol.CsName).Append(" == this.").Append(trytb.Primarys[a].CsName); lmbdWhere.Append("a.").Append(trycol.CsName).Append(" == this.").Append(trytb.Primarys[a].CsName);
@@ -506,13 +506,19 @@ namespace FreeSql.Internal {
.Append(" public override ").Append(propTypeName).Append(" ").Append(pnv.Name).AppendLine(" {"); .Append(" public override ").Append(propTypeName).Append(" ").Append(pnv.Name).AppendLine(" {");
if (vp.Item2) { //get 重写 if (vp.Item2) { //get 重写
cscode.Append(" get {\r\n") cscode.Append(" get {\r\n")
.Append(" if (base.").Append(pnv.Name).Append(" == null && __lazy__").Append(pnv.Name).AppendLine(" == false) {") .Append(" if (base.").Append(pnv.Name).Append(" == null && __lazy__").Append(pnv.Name).AppendLine(" == false) {");
.Append(" base.").Append(pnv.Name).Append(" = __fsql_orm__.Select<").Append(propElementType.IsNested ? $"{propElementType.DeclaringType.Namespace}.{propElementType.DeclaringType.Name}.{propElementType.Name}" : $"{propElementType.Namespace}.{propElementType.Name}").Append(">().Where(a => ").Append(lmbdWhere.ToString()).AppendLine(").ToList();");
if (refprop != null) { if (nvref.Exception == null) {
cscode.Append(" foreach (var loc1 in base.").Append(pnv.Name).AppendLine(")") cscode.Append(" base.").Append(pnv.Name).Append(" = __fsql_orm__.Select<").Append(propElementType.IsNested ? $"{propElementType.DeclaringType.Namespace}.{propElementType.DeclaringType.Name}.{propElementType.Name}" : $"{propElementType.Namespace}.{propElementType.Name}").Append(">().Where(a => ").Append(lmbdWhere.ToString()).AppendLine(").ToList();");
.Append(" loc1.").Append(refprop.Name).AppendLine(" = this;"); if (refprop != null) {
} cscode.Append(" foreach (var loc1 in base.").Append(pnv.Name).AppendLine(")")
cscode.Append(" __lazy__").Append(pnv.Name).AppendLine(" = true;") .Append(" loc1.").Append(refprop.Name).AppendLine(" = this;")
.Append(" __lazy__").Append(pnv.Name).AppendLine(" = true;");
}
} else
cscode.Append(" throw new Exception(\"").Append(nvref.Exception.Message.Replace("\r\n", "\\r\\n").Replace("\"", "\\\"")).AppendLine("\");");
cscode
.Append(" }\r\n") .Append(" }\r\n")
.Append(" return base.").Append(pnv.Name).AppendLine(";") .Append(" return base.").Append(pnv.Name).AppendLine(";")
.Append(" }\r\n"); .Append(" }\r\n");
@@ -574,14 +580,14 @@ namespace FreeSql.Internal {
if (trycol == null) { if (trycol == null) {
nvref.Exception = new Exception($"导航属性 {trytbTypeName}.{pnv.Name} 没有找到对应的字段，如：{pnv.Name}{findtbrefPkCsName}、{pnv.Name}_{findtbrefPkCsName}"); nvref.Exception = new Exception($"导航属性 {trytbTypeName}.{pnv.Name} 没有找到对应的字段，如：{pnv.Name}{findtbrefPkCsName}、{pnv.Name}_{findtbrefPkCsName}");
trytb.AddOrUpdateTableRef(pnv.Name, nvref); trytb.AddOrUpdateTableRef(pnv.Name, nvref);
if (isLazy) throw nvref.Exception; //if (isLazy) throw nvref.Exception;
continue; continue;
} }
nvref.Columns.Add(trycol); nvref.Columns.Add(trycol);
nvref.RefColumns.Add(tbref.Primarys[a]); nvref.RefColumns.Add(tbref.Primarys[a]);
if (isLazy) { if (isLazy && nvref.Exception == null) {
if (a > 0) lmbdWhere.Append(" && "); if (a > 0) lmbdWhere.Append(" && ");
lmbdWhere.Append("a.").Append(tbref.Primarys[a].CsName).Append(" == this.").Append(trycol.CsName); lmbdWhere.Append("a.").Append(tbref.Primarys[a].CsName).Append(" == this.").Append(trycol.CsName);
} }
@@ -597,9 +603,15 @@ namespace FreeSql.Internal {
.Append(" public override ").Append(propTypeName).Append(" ").Append(pnv.Name).AppendLine(" {"); .Append(" public override ").Append(propTypeName).Append(" ").Append(pnv.Name).AppendLine(" {");
if (vp.Item2) { //get 重写 if (vp.Item2) { //get 重写
cscode.Append(" get {\r\n") cscode.Append(" get {\r\n")
.Append(" if (base.").Append(pnv.Name).Append(" == null && __lazy__").Append(pnv.Name).AppendLine(" == false) {") .Append(" if (base.").Append(pnv.Name).Append(" == null && __lazy__").Append(pnv.Name).AppendLine(" == false) {");
.Append(" base.").Append(pnv.Name).Append(" = __fsql_orm__.Select<").Append(propTypeName).Append(">().Where(a => ").Append(lmbdWhere.ToString()).AppendLine(").ToOne();")
.Append(" __lazy__").Append(pnv.Name).AppendLine(" = true;") if (nvref.Exception == null)
cscode.Append(" base.").Append(pnv.Name).Append(" = __fsql_orm__.Select<").Append(propTypeName).Append(">().Where(a => ").Append(lmbdWhere.ToString()).AppendLine(").ToOne();")
.Append(" __lazy__").Append(pnv.Name).AppendLine(" = true;");
else
cscode.Append(" throw new Exception(\"").Append(nvref.Exception.Message.Replace("\r\n", "\\r\\n").Replace("\"", "\\\"")).AppendLine("\");");
cscode
.Append(" }\r\n") .Append(" }\r\n")
.Append(" return base.").Append(pnv.Name).AppendLine(";") .Append(" return base.").Append(pnv.Name).AppendLine(";")
.Append(" }\r\n"); .Append(" }\r\n");