Merge branch 'develop'

nathan-parkinson · Jan 3, 2019 · 657572c · 657572c
2 parents 2506b18 + 6c30c2f
commit 657572c
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 20 deletions.
diff --git a/src/LinqToDB.Include/Accessors/IRootAccessor.cs b/src/LinqToDB.Include/Accessors/IRootAccessor.cs
@@ -7,6 +7,7 @@ namespace LinqToDB.Include
     interface IRootAccessor
     {
         PropertyAccessor<TEntity, TProperty> GetByPath<TEntity, TProperty>(List<string> pathParts) where TEntity : class where TProperty : class;
+        IPropertyAccessor GetByPath(List<string> pathParts);
         MappingSchema MappingSchema { get; }
     }
 }
diff --git a/src/LinqToDB.Include/Accessors/RootAccessor.cs b/src/LinqToDB.Include/Accessors/RootAccessor.cs
@@ -30,6 +30,23 @@ PropertyAccessor<TEntity, TProperty> IRootAccessor.GetByPath<TEntity, TProperty>
             return result as PropertyAccessor<TEntity, TProperty>;
         }
 
+        IPropertyAccessor IRootAccessor.GetByPath(List<string> pathParts)
+        {
+            var thisPath = pathParts.First();
+
+            //TODO get by Type and PropertyName to account for multiple inherited classes with same PropertyName
+            var accessor = Properties.SingleOrDefault(x => x.PropertyName == thisPath);
+            if (accessor == null)
+            {
+                return null;
+            }
+
+            var result = accessor.FindAccessor(pathParts.Skip(1).ToList());
+
+            return result;
+        }
+
+
         public void LoadMap(List<TClass> entities, IQueryable<TClass> query)
         {
             foreach (var propertyAccessor in Properties.OrderBy(x => x.PropertyName))

diff --git a/src/LinqToDB.Include/Visitors/PropertyVisitor.cs b/src/LinqToDB.Include/Visitors/PropertyVisitor.cs
@@ -15,14 +15,17 @@ internal PropertyVisitor(IRootAccessor<TClass> rootAccessor)
         {
             _rootAccessor = rootAccessor;
         }
-
-
-        private static void AddFilterForInheritedType<T, TProperty>(IPropertyAccessor<T> accessor, 
-            Expression<Func<TProperty, bool>> includeFilter)
-            where T : class
-            where TProperty : class
+
+        private static void AddFilterForDynamicType<T, TProperty>(IPropertyAccessor<T> accessor,
+    Expression<Func<TProperty, bool>> includeFilter)
+    where T : class
+    where TProperty : class
         {
-            var accessorImpl = (PropertyAccessor<T, TProperty>)accessor;
+            var accessorImpl = accessor as PropertyAccessor<T, TProperty>;
+            if (accessorImpl == null)
+            {
+                throw new PropertyAccessorNotFoundException($"PropertyAccessor<{typeof(T).Name}, {typeof(TProperty).Name}> not found");
+            }
             accessorImpl.AddFilter(includeFilter);
         }
 
@@ -31,28 +34,27 @@ public IRootAccessor<TClass> MapProperties<TProperty>(Expression<Func<TClass, TP
             where TProperty : class
         {
             Visit(expr);
+
             var accessor = latestAccessor as IPropertyAccessor<TClass>;
+            //dupes at this point
+            if (!_rootAccessor.Properties.Contains(accessor))
+            {
+                _rootAccessor.Properties.Add(accessor);
+            }
+
             if (includeFilter != null)
             {
                 if (latestAccessor is PropertyAccessor<TClass, TProperty> accessorImpl)
                 {
                     accessorImpl.AddFilter(includeFilter);
                 }
-                else if (typeof(TClass).IsAssignableFrom(latestAccessor.DeclaringType))
-                {
-                    dynamic dynamicAccessor = latestAccessor;
-                    AddFilterForInheritedType(dynamicAccessor, includeFilter);
-                }
                 else
                 {
-                    throw new PropertyAccessorNotFoundException($"PropertyAccessor<{typeof(TClass).Name}, {typeof(TProperty).Name}> not found");
-                }
-            }
-
-            //dupes at this point
-            if (!_rootAccessor.Properties.Contains(accessor))
-            {
-                _rootAccessor.Properties.Add(accessor);
+                    //can type checking be added here?
+                    var propertyAccessor = _rootAccessor.GetByPath(PathWalker.GetPath(expr));
+                    dynamic dynamicAccessor = propertyAccessor;
+                    AddFilterForDynamicType(dynamicAccessor, includeFilter);                    
+                }                
             }
 
             return _rootAccessor;
@@ -86,6 +88,7 @@ protected override Expression VisitMember(MemberExpression node)
         {
             //check PropertyAccessor for the property does not already exist
             var localAccessor = CreateAccessor(node);
+
             latestAccessor = localAccessor;
             return base.VisitMember(node);
         }