tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-04-22 10:42:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix PgArrayToMany

Browse Source
This commit is contained in:
2881099 2022-06-04 16:10:20 +08:00
parent 53bea5beb1
commit 7839b42ac2
5 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FreeSql.Tests/FreeSql.Tests/Issues/623.cs
View File

@ -44,7 +44,7 @@ namespace FreeSql.Tests.Issues
FacilityCount = a.Sum(a.Value.FacilityCount),
FacilityOpenCount = a.Sum(a.Value.FacilityOpenCount)
});
Assert.Equal(@"SELECT a.`Dot`, sum(a.`FacilityCount`) as1, sum(a.`FacilityOpenCount`) as2
Assert.Equal(@"SELECT a.`Dot` as1, sum(a.`FacilityCount`) as2, sum(a.`FacilityOpenCount`) as3
FROM `ts_facility` a
WHERE (a.`Date` = cast(date_format('2020-12-30 00:00:00.000','%Y-%m-%d') as datetime)) AND (((a.`EnterpriseId`) in (5))) AND (a.`FacilityType` = 1)
GROUP BY a.`Dot`", sql);

2
FreeSql/Extensions/FreeSqlGlobalExtensions.cs
View File

@ -48,7 +48,7 @@ public static partial class FreeSqlGlobalExtensions
});
public static bool IsIntegerType(this Type that) => that == null ? false : (_dicIsNumberType.Value.TryGetValue(that, out var tryval) ? tryval : false);
public static bool IsNumberType(this Type that) => that == null ? false : _dicIsNumberType.Value.ContainsKey(that);
public static bool IsNullableType(this Type that) => that.IsArray == false && that?.FullName.StartsWith("System.Nullable`1[") == true;
public static bool IsNullableType(this Type that) => that == null ? false : (that.IsArray == false && that.FullName.StartsWith("System.Nullable`1[") == true);
public static bool IsAnonymousType(this Type that) => that == null ? false : (that.FullName.StartsWith("<>f__AnonymousType") || that.FullName.StartsWith("VB$AnonymousType"));
public static bool IsArrayOrList(this Type that) => that == null ? false : (that.IsArray || typeof(IList).IsAssignableFrom(that));
public static Type NullableTypeOrThis(this Type that) => that?.IsNullableType() == true ? that.GetGenericArguments().First() : that;

17
FreeSql/FreeSql.xml
View File

@ -4440,6 +4440,23 @@
中间表，多对多
</summary>
</member>
<member name="F:FreeSql.Internal.Model.TableRefType.PgArrayToMany">
<summary>
PostgreSQL 数组类型专属功能<para></para>
方式一：select * from Role where Id in (RoleIds)<para></para>
class User {<para></para>
____public int[] RoleIds { get; set; }<para></para>
____[Navigate(nameof(RoleIds))]<para></para>
____public List&lt;Role&gt; Roles { get; set; }<para></para>
}<para></para>
方式二：select * from User where RoleIds @&gt; Id<para></para>
class Role {<para></para>
____public int Id { get; set; }<para></para>
____[Navigate(nameof(User.RoleIds))]<para></para>
____public List&lt;User&gt; Users { get; set; }<para></para>
}<para></para>
</summary>
</member>
<member name="P:FreeSql.Internal.ObjectPool.IObjectPool`1.IsAvailable">
<summary>
是否可用

18
FreeSql/Internal/Model/TableInfo.cs
View File

@ -150,6 +150,22 @@ namespace FreeSql.Internal.Model
}
public enum TableRefType
{
OneToOne, ManyToOne, OneToMany, ManyToMany, PgArrayToMany
OneToOne, ManyToOne, OneToMany, ManyToMany,
/// <summary>
/// PostgreSQL 数组类型专属功能<para></para>
/// 方式一：select * from Role where Id in (RoleIds)<para></para>
/// class User {<para></para>
/// ____public int[] RoleIds { get; set; }<para></para>
/// ____[Navigate(nameof(RoleIds))]<para></para>
/// ____public List&lt;Role&gt; Roles { get; set; }<para></para>
/// }<para></para>
/// 方式二：select * from User where RoleIds @&gt; Id<para></para>
/// class Role {<para></para>
/// ____public int Id { get; set; }<para></para>
/// ____[Navigate(nameof(User.RoleIds))]<para></para>
/// ____public List&lt;User&gt; Users { get; set; }<para></para>
/// }<para></para>
/// </summary>
PgArrayToMany
}
}

17
FreeSql/Internal/UtilsExpressionTree.cs
View File

@ -1014,7 +1014,8 @@ namespace FreeSql.Internal
{
if (trytb.ColumnsByCs.TryGetValue(pnvBind[0], out trycol))
{
if (trycol.CsType.IsArray == true && tbref.Primarys[0].CsType.NullableTypeOrThis() != trycol.CsType.GetElementType().NullableTypeOrThis())
if (trycol.CsType.IsArray == false) trycol = null;
else if (trycol != null && tbref.Primarys[0].CsType.NullableTypeOrThis() != trycol.CsType.GetElementType().NullableTypeOrThis())
{
nvref.Exception = new Exception($"导航属性 {trytbTypeName}.{pnv.Name} 特性 [Navigate] 解析错误，{trytbTypeName}.{trycol.CsName} 数组元素 与 {tbrefTypeName}.{tbref.Primarys[0].CsName} 类型不符");
trytb.AddOrUpdateTableRef(pnv.Name, nvref);
@ -1022,7 +1023,7 @@ namespace FreeSql.Internal
}
}
}
if (nvref.Exception == null && trycol == null)
if (pnvBind == null && trycol == null)
{
var findtbrefPkCsName = tbref.Primarys[0].CsName.TrimStart('_');
if (findtbrefPkCsName.StartsWith(trytb.Type.Name, StringComparison.CurrentCultureIgnoreCase)) findtbrefPkCsName = findtbrefPkCsName.Substring(trytb.Type.Name.Length).TrimStart('_');
@ -1059,7 +1060,8 @@ namespace FreeSql.Internal
{
if (tbref.ColumnsByCs.TryGetValue(pnvBind[0], out trycol))
{
if (trycol.CsType.IsArray == true && trytb.Primarys[0].CsType.NullableTypeOrThis() != trycol.CsType.GetElementType().NullableTypeOrThis())
if (trycol.CsType.IsArray == false) trycol = null;
else if (trytb.Primarys[0].CsType.NullableTypeOrThis() != trycol.CsType.GetElementType().NullableTypeOrThis())
{
nvref.Exception = new Exception($"导航属性 {trytbTypeName}.{pnv.Name} 特性 [Navigate] 解析错误，{trytbTypeName}.{trytb.Primarys[0].CsName} 与 {tbrefTypeName}.{trycol.CsName} 数组元素类型不符");
trytb.AddOrUpdateTableRef(pnv.Name, nvref);
@ -1067,7 +1069,7 @@ namespace FreeSql.Internal
}
}
}
if (nvref.Exception == null && trycol == null)
if (pnvBind != null && trycol == null)
{
var findtrytbPkCsName = trytb.Primarys[0].CsName.TrimStart('_');
if (findtrytbPkCsName.StartsWith(trytb.Type.Name, StringComparison.CurrentCultureIgnoreCase)) findtrytbPkCsName = findtrytbPkCsName.Substring(trytb.Type.Name.Length).TrimStart('_');
@ -1086,9 +1088,12 @@ namespace FreeSql.Internal
isArrayToMany = trycol != null;
if (isArrayToMany)
{
cscodeExtLogic = $" if (this.{trytb.Primarys[0].CsName} == null) return null;\r\n";
lmbdWhere.Append("a.").Append(trycol.CsName).Append(".Contains(this.").Append(trytb.Primarys[0].CsName);
if (trycol.CsType.GetElementType().IsNullableType() == false && trytb.Primarys[0].CsType.IsNullableType()) lmbdWhere.Append(".Value");
if (trycol.CsType.GetElementType().IsNullableType() == false && trytb.Primarys[0].CsType.IsNullableType())
{
lmbdWhere.Append(".Value");
cscodeExtLogic = $" if (this.{trytb.Primarys[0].CsName} == null) return null;\r\n";
}
lmbdWhere.Append(")");
nvref.Columns.Add(tbref.Primarys[0]);
nvref.RefColumns.Add(trycol);