#53 extension method being mapped by compiler that should not be.

Author: kccarter76

SubSonic.Core.DataAccessLayer/src/Data/ChangeTracking/ChangeTrackerCollection.cs

@@ -178,14 +178,14 @@ private IEnumerable<KeyValuePair<Type, IEnumerable<IEntityProxy>>> BuildEnumerat
                 case DbQueryType.Insert:
                     return collection
                         .OrderBy(x => x.Value.Model.ObjectGraphWeight)
-                        .Select(set => new KeyValuePair<Type, IEnumerable<IEntityProxy>>(set.Key, set.Value.Select(x => (IEntityProxy)x)));
+                        .Select(set => new KeyValuePair<Type, IEnumerable<IEntityProxy>>(set.Key, set.Value.ToProxyCollection()));
                 case DbQueryType.Delete:
                     return collection
                         .OrderByDescending(x => x.Value.Model.ObjectGraphWeight)
-                        .Select(set => new KeyValuePair<Type, IEnumerable<IEntityProxy>>(set.Key, set.Value.Select(x => (IEntityProxy)x)));
+                        .Select(set => new KeyValuePair<Type, IEnumerable<IEntityProxy>>(set.Key, set.Value.ToProxyCollection()));
                 case DbQueryType.Unknown:
                     return collection
-                       .Select(set => new KeyValuePair<Type, IEnumerable<IEntityProxy>>(set.Key, set.Value.Select(x => (IEntityProxy)x)));
+                       .Select(set => new KeyValuePair<Type, IEnumerable<IEntityProxy>>(set.Key, set.Value.ToProxyCollection()));
             }
             throw Error.NotSupported();
         }

SubSonic.Core.DataAccessLayer/src/Data/ChangeTracking/ChangeTrackerElement.cs

@@ -298,6 +298,23 @@ public void Clear()
             ((IList)Cache).Clear();
         }
 
+        public IEnumerable<IEntityProxy> ToProxyCollection()
+        {
+            IList<IEntityProxy> proxies = new List<IEntityProxy>();
+
+            foreach(IEntityProxy proxy in Cache)
+            {
+                if (proxy is null)
+                {
+                    throw Error.InvalidOperation();
+                }
+
+                proxies.Add(proxy);
+            }
+
+            return proxies;
+        }
+
         public abstract void Add(object record);
 
         public abstract bool Remove(object record);

SubSonic.Core.DataAccessLayer/src/Linq/Extensions/SubSonicQueryable/EnumerableExtensions.cs

@@ -34,27 +34,5 @@ public static IQueryable<TSource> ForEach<TSource>(this IQueryable<TSource> sour
 
             return source;
         }
-
-        public static IEnumerable<TResult> Select<TResult>(this IEnumerable source, Func<object, TResult> selector)
-        {
-            if (source is null)
-            {
-                throw new ArgumentNullException(nameof(source));
-            }
-
-            if (selector is null)
-            {
-                throw new ArgumentNullException(nameof(selector));
-            }
-
-            List<TResult> result = new List<TResult>();
-
-            foreach(object item in source)
-            {
-                result.Add(selector(item));
-            }
-
-            return result;
-        }
     }
 }

SubSonic.Extensions.SqlServer/SubSonic.Extensions.SqlServer.csproj

@@ -29,7 +29,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Data.SqlClient" Version="2.0.0" />
-    <PackageReference Include="SubSonic.Core.DAL" Version="4.1.1" />
+    <PackageReference Include="SubSonic.Core.DAL" Version="4.1.2" />
   </ItemGroup>
 
   <ItemGroup>

SubSonic.Tests/DAL/ExtensionMethod/IncludeExtensionMethodTests.cs

@@ -1,19 +1,14 @@
 using FluentAssertions;
+using Microsoft.Extensions.Logging;
 using NUnit.Framework;
+using SubSonic.Extensions.Test;
+using SubSonic.Linq;
+using SubSonic.Logging;
 using System;
 using System.Linq;
 
 namespace SubSonic.Tests.DAL.ExtensionMethod
 {
-    using Linq;
-    using Microsoft.Extensions.Logging;
-    using SubSonic.Extensions.Test;
-    using SubSonic.Extensions.Test.Models;
-    using SubSonic.Logging;
-    using System.Threading.Tasks;
-    using Models = Extensions.Test.Models;
-
-
     public partial class ExtensionMethodTests
     {
         [Test]

SubSonic.Tests/DAL/SubSonicContext/DbDeleteTests.cs

@@ -81,9 +81,16 @@ SELECT [T3].[UnitID]
         [TestCaseSource(nameof(DeleteTestCases))]
         public void ShouldBeAbleToDeleteOneOrMoreRecords(IDbTestCase dbTest)
         {
-            IEnumerable<IEntityProxy>
-                expected = dbTest.FetchAll().Select(x =>
-                    x as IEntityProxy);
+            IList<IEntityProxy>
+                expected = new List<IEntityProxy>();
+
+            foreach (IEntityProxy proxy in dbTest.FetchAll())
+            {
+                if (proxy != null)
+                {
+                    expected.Add(proxy);
+                }
+            }
 
             int
                 before = dbTest.Count(),

SubSonic.Tests/DAL/SubSonicContext/DbUpdateTests.cs

@@ -59,9 +59,16 @@ FROM [dbo].[Renter] AS [T1]
         [TestCaseSource(nameof(UpdateTestCases))]
         public void CanUpdateEntities(IDbTestCase dbTest)
         {
-            IEnumerable<IEntityProxy>
-                expected = dbTest.FetchAll().Select(x =>
-                    x as IEntityProxy);
+            IList<IEntityProxy>
+                 expected = new List<IEntityProxy>();
+
+            foreach (IEntityProxy proxy in dbTest.FetchAll())
+            {
+                if (proxy != null)
+                {
+                    expected.Add(proxy);
+                }
+            }
 
             expected.Count().Should().Be(dbTest.Count());
 

SubSonic.Tests/SubSonic.Tests.csproj

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