Skip to content

Commit 5fec5f4

Browse files
author
zzzprojects
committed
Allow Include Invariant
Allow Include Invariant
1 parent e5d6565 commit 5fec5f4

File tree

4 files changed

+17
-3
lines changed

4 files changed

+17
-3
lines changed
5.1 MB
Binary file not shown.

src/Z.EntityFramework.Plus.sln

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26730.3
4+
VisualStudioVersion = 15.0.26730.12
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{14D8985E-0AA8-444A-A32E-D766ABA114D6}"
77
EndProject
@@ -87,6 +87,7 @@ Global
8787
shared\Z.EF.Plus.QueryCache.Shared\Z.EF.Plus.QueryCache.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
8888
shared\Z.EF.Plus.QueryDeferred.Shared\Z.EF.Plus.QueryDeferred.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
8989
shared\Z.EF.Plus.QueryExtensions.Shared\Z.EF.Plus.QueryExtensions.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
90+
shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
9091
shared\Z.EF.Plus.QueryFilterInterceptor.Shared\Z.EF.Plus.QueryFilterInterceptor.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
9192
shared\Z.EF.Plus.QueryFuture.Shared\Z.EF.Plus.QueryFuture.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
9293
shared\Z.EF.Plus.QueryIncludeFilter.Shared\Z.EF.Plus.QueryIncludeFilter.Shared.projitems*{6ea3675a-ab66-4aba-94d1-3da69fa88d4e}*SharedItemsImports = 4
@@ -101,6 +102,7 @@ Global
101102
shared\Z.EF.Plus.QueryCache.Shared\Z.EF.Plus.QueryCache.Shared.projitems*{ac398eb8-0a31-4d06-a804-84d10b6da96d}*SharedItemsImports = 4
102103
shared\Z.EF.Plus.QueryDeferred.Shared\Z.EF.Plus.QueryDeferred.Shared.projitems*{ac398eb8-0a31-4d06-a804-84d10b6da96d}*SharedItemsImports = 4
103104
shared\Z.EF.Plus.QueryExtensions.Shared\Z.EF.Plus.QueryExtensions.Shared.projitems*{ac398eb8-0a31-4d06-a804-84d10b6da96d}*SharedItemsImports = 4
105+
shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.projitems*{ac398eb8-0a31-4d06-a804-84d10b6da96d}*SharedItemsImports = 4
104106
shared\Z.EF.Plus.QueryFilterInterceptor.Shared\Z.EF.Plus.QueryFilterInterceptor.Shared.projitems*{ac398eb8-0a31-4d06-a804-84d10b6da96d}*SharedItemsImports = 4
105107
shared\Z.EF.Plus.QueryFuture.Shared\Z.EF.Plus.QueryFuture.Shared.projitems*{ac398eb8-0a31-4d06-a804-84d10b6da96d}*SharedItemsImports = 4
106108
shared\Z.EF.Plus.QueryIncludeFilter.Shared\Z.EF.Plus.QueryIncludeFilter.Shared.projitems*{ac398eb8-0a31-4d06-a804-84d10b6da96d}*SharedItemsImports = 4

src/shared/Z.EF.Plus.QueryIncludeOptimized.Shared/QueryIncludeOptimizedByPath.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,19 @@ public static Expression AppendPropertyPath(Expression expression, string[] path
9393
// ENSURE property exists
9494
if (property == null)
9595
{
96-
throw new Exception(string.Format(ExceptionMessage.QueryIncludeOptimized_ByPath_MissingPath, elementType.FullName, paths[currentIndex]));
96+
// Try Again with case insensitive
97+
var properties = elementType.GetProperties(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)
98+
.Where(x => x.Name.ToLowerInvariant() == paths[currentIndex].ToLowerInvariant()).ToList();
99+
100+
if (properties.Count == 1)
101+
{
102+
property = properties[0];
103+
}
104+
105+
if (property == null)
106+
{
107+
throw new Exception(string.Format(ExceptionMessage.QueryIncludeOptimized_ByPath_MissingPath, elementType.FullName, paths[currentIndex]));
108+
}
97109
}
98110

99111
expression = Expression.Property(expression, property);

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.6.21
1+
v1.7.2

0 commit comments

Comments
 (0)