#53 refactored the activate and load to accomodate NonEntity and Entity Classes.

Author: kccarter76

SubSonic.Core.DataAccessLayer/src/Builders/DbSqlQueryBuilder/DbSqlQueryBuilderQueryProvider.cs

@@ -189,7 +189,7 @@ public TResult Execute<TResult>(Expression expression)
                                     }
                                 }
                             }
-                            else if (CmdBehavior == CommandBehavior.SingleRow)
+                            else if (CmdBehavior == CommandBehavior.Default)
                             {
                                 IList result = Activator.CreateInstance(typeof(List<>).MakeGenericType(elementType)) as IList;
 

SubSonic.Core.DataAccessLayer/src/Collections/SubSonicCollection/SubSonicCollection.cs

@@ -126,13 +126,13 @@ public override IEnumerable ToArray()
 
         IEnumerator<TEntity> IEnumerable<TEntity>.GetEnumerator()
         {
-            if (TableData is ICollection<TEntity> data)
+            if (!IsLoaded)
             {
-                if (!IsLoaded)
-                {
-                    Load();
-                }
+                Load();
+            }
 
+            if (TableData is ICollection<TEntity> data)
+            {
                 return data.GetEnumerator();
             }
             else
@@ -143,12 +143,18 @@ IEnumerator<TEntity> IEnumerable<TEntity>.GetEnumerator()
 
         public override IQueryable Load()
         {
-            if (Provider.Execute<IEnumerable<TEntity>>(Expression) is ISubSonicCollection elements)
+            IEnumerable<TEntity> result = Provider.Execute<IEnumerable<TEntity>>(Expression);
+
+            if (result is ISubSonicCollection elements)
             {
                 TableData = (IEnumerable)Activator.CreateInstance(typeof(HashSet<>).MakeGenericType(ElementType), elements.ToArray());
-
-                IsLoaded = true;
             }
+            else
+            {
+                TableData = (IEnumerable)Activator.CreateInstance(typeof(HashSet<>).MakeGenericType(ElementType), result);
+            }
+
+            IsLoaded = true;
 
             return this;
         }

SubSonic.Core.DataAccessLayer/src/Extensions/Internal/DatabaseReaders.cs

@@ -3,27 +3,31 @@
 using SubSonic.Schema;
 using System;
 using System.Data;
+using System.Reflection;
 
 namespace SubSonic
 {
     internal static partial class InternalExtensions
     {
         public static object LoadInstanceOf(this IDataRecord data, object entity)
         {
-            IDbEntityModel model = SubSonicContext.DbModel.GetEntityModel(entity.GetType());
+            Type entityType = entity.GetType();
+            SubSonicContext.DbModel.TryGetEntityModel(entityType, out IDbEntityModel model);
 
-            foreach (IDbEntityProperty property in model.Properties)
+            foreach (PropertyInfo property in entityType.GetProperties())
             {
-                if (property.EntityPropertyType == DbEntityPropertyType.Value)
+                if (model != null && model[property.Name].EntityPropertyType != DbEntityPropertyType.Value)
                 {
-                    object value = data[property.Name];
+                    continue;
+                }
+
+                object value = data[model?[property.Name].Name ?? property.Name];
 
-                    if (property.PropertyType.IsAssignableFrom(value.GetType()))
-                    {
-                        model.EntityModelType
-                            .GetProperty(property.PropertyName)
-                            .SetValue(entity, value);
-                    }
+                if (property.PropertyType.IsAssignableFrom(value.GetType()))
+                {
+                    entityType
+                        .GetProperty(property.Name)
+                        .SetValue(entity, value);
                 }
             }
 
@@ -49,7 +53,8 @@ public static object ActivateAndLoadInstanceOf(this IDataRecord data, Type entit
 
             object entity = null;
 
-            if (SubSonicContext.DbOptions.EnableProxyGeneration)
+            if (SubSonicContext.DbOptions.EnableProxyGeneration &&
+                SubSonicContext.DbModel.IsEntityModelRegistered(entityType))
             {
                 DynamicProxyWrapper wrapper = DynamicProxy.GetProxyWrapper(entityType);
 

SubSonic.Tests/DAL/SUT/BaseTestFixture.cs

@@ -283,7 +283,7 @@ INNER JOIN [dbo].[Person] AS [T5]
 
             Context.Database.Instance.AddCommandBehavior(memberInitializedUsingDatasource, cmd =>
             {
-                return BuildDataTable(CurrentRenters);
+                return BuildDataTable(CurrentRenters.ToList());
             });
 
             Context.Database.Instance.AddCommandBehavior(memberInitializedUsingDatasourceCount, cmd =>
@@ -340,7 +340,9 @@ protected DataTable BuildDataTable<TEntity>(IEnumerable<TEntity> entities)
                 );
             }
 
-            return entities.ToDataTable();
+            DataTable data = entities.ToDataTable();
+
+            return data;
         }
 
         protected virtual void SetInsertBehaviors()

SubSonic.Tests/SubSonic.Tests.csproj

@@ -22,7 +22,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="SubSonic.Core.Abstractions" Version="4.2.0-beta.4" />
     <PackageReference Include="SubSonic.Extensions.SqlServer" Version="4.2.0" />
-    <PackageReference Include="SubSonic.Extensions.Test" Version="4.2.0" />
+    <PackageReference Include="SubSonic.Extensions.Test" Version="4.2.1-beta.6" />
   </ItemGroup>
 
   <ItemGroup>