#53 identified an issue that resulted in a non entity not resolving the property value and attempting to map to db.

Author: kccarter76

SubSonic.Core.DataAccessLayer/src/Builders/DbWherePredicateBuilder/DbWherePredicateBuilder.cs

@@ -240,11 +240,10 @@ public Expression ParseLambda(Expression predicate)
             return body;
         }
 
-        private static DbTableExpression GetDbTable(Type type) => __instances
-            .Select(builder => 
-                builder.table)
-            .Single(table => 
-                table.Type.GenericTypeArguments[0] == type || table.Type.GenericTypeArguments[0].IsSubclassOf(type));
+        private IEnumerable<DbTableExpression> DbTables => __instances.Select(builder => builder.table);
+            
+        private DbTableExpression GetDbTable(Type type) => DbTables.Single(table =>
+                    table.Type.GenericTypeArguments[0] == type || table.Type.GenericTypeArguments[0].IsSubclassOf(type));
 
         private Expression GetDbColumnExpression(PropertyInfo propertyInfo)
         {

SubSonic.Core.DataAccessLayer/src/Builders/DbWherePredicateBuilder/DbWherePredicateBuilderVisit.cs

@@ -344,9 +344,23 @@ protected override Expression VisitMember(MemberExpression node)
             {
                 if (node.Expression is MemberExpression member)
                 {
-                    if (member.Expression is ConstantExpression value)
+                    if (member.Expression is ConstantExpression constant)
                     {
-                        return VisitMemberExtended(node);
+                        if (DbTables.Any(x => x.Type.GenericTypeArguments[0] == node.Member.DeclaringType))
+                        {
+                            return VisitMemberExtended(node);
+                        }
+                        else if (member.Member is FieldInfo field)
+                        {
+                            object value = field.GetValue(constant.Value);
+
+                            if (node.Member is PropertyInfo property)
+                            {
+                                value = property.GetValue(value);
+                            }
+
+                            return Visit(Expression.Constant(value));
+                        }
                     }
                     else
                     {

SubSonic.Tests/DAL/ExtensionMethod/ExtensionMethodTests.cs

@@ -133,5 +133,11 @@ public void TheAverageMethodIsSupported()
 
             renter.Person.Renters.Average(x => x.Rent).Should().Be(Renters.Where(x => x.PersonID == renter.PersonID).Average(x => x.Rent));
         }
+
+        [Test]
+        public void TheSingleMethodIsSupported()
+        {
+            Person person = Context.People.Single(x => x.ID == 1);
+        }
     }
 }

SubSonic.Tests/DAL/ExtensionMethod/IncludeExtensionMethodTests.cs

@@ -45,7 +45,9 @@ public void CanGetMemberInitializedUsingDatasource()
                 {
                     iterated = true;
 
-                    view.FullName.Should().Be(People.Single(x => x.ID == view.PersonID).FullName);
+                    var person = Context.People.Single(x => x.ID == view.PersonID);
+
+                    view.FullName.Should().Be(person.FullName);
                 }
 
                 Context.Database.Instance.RecievedCommand(@"SELECT [T1].[PersonID], [T2].[FullName], [T1].[Rent], [T1].[UnitID], COALESCE([T3].[HasParallelPowerGeneration], 0) AS [HasParallelPowerGeneration], [T4].[Name] AS [Status]

SubSonic.Tests/DAL/SUT/BaseTestFixture.cs

@@ -339,6 +339,21 @@ protected DataTable BuildDataTable<TEntity>(IEnumerable<TEntity> entities)
                 }
                 );
             }
+            else if (typeof(TEntity) == typeof(RenterView))
+            {
+                Parallel.ForEach(entities, entity =>
+                {
+                    if (entity is RenterView renterView)
+                    {
+                        var person = People.Single(x => x.ID == renterView.PersonID);
+
+                        renterView.FullName = String.Format("{0}, {1}{2}",
+                            person.FamilyName, person.FirstName,
+                            string.IsNullOrEmpty(person.MiddleInitial?.Trim()) ? "" : $" {person.MiddleInitial}.");
+                    }
+                }
+                );
+            }
 
             DataTable data = entities.ToDataTable();