Query: Add null check in hash computation in SqlFunctionExpression

Resolves #23336
dotnet · Nov 16, 2020 · f8fcf5a · f8fcf5a
1 parent d05f81d
commit f8fcf5a
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 2 deletions.
diff --git a/src/EFCore.Relational/Query/SqlExpressions/SqlFunctionExpression.cs b/src/EFCore.Relational/Query/SqlExpressions/SqlFunctionExpression.cs
@@ -394,9 +394,12 @@ public override int GetHashCode()
             hash.Add(IsNiladic);
             hash.Add(Schema);
             hash.Add(Instance);
-            for (var i = 0; i < Arguments.Count; i++)
+            if (Arguments != null)
             {
-                hash.Add(Arguments[i]);
+                for (var i = 0; i < Arguments.Count; i++)
+                {
+                    hash.Add(Arguments[i]);
+                }
             }
 
             return hash.ToHashCode();

diff --git a/test/EFCore.Specification.Tests/Query/SpatialQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/SpatialQueryTestBase.cs
@@ -1243,6 +1243,36 @@ public virtual Task Z(bool async)
                 });
         }
 
+        [ConditionalTheory]
+        [MemberData(nameof(IsAsyncData))]
+        public virtual Task XY_with_collection_join(bool async)
+        {
+            return AssertFirstOrDefault(
+                async,
+                ss => ss.Set<PointEntity>()
+                    .OrderBy(e => e.Id)
+                    .Select(e => new
+                    {
+                        e.Id,
+                        I = new
+                        {
+                            X = e.Point == null ? (double?)null : e.Point.X,
+                            Y = e.Point == null ? (double?)null : e.Point.Y
+                        },
+                        List = ss.Set<PointEntity>().Where(i => i.Id == e.Id).ToList()
+                    }),
+                asserter: (e, a) =>
+                {
+                    AssertEqual(e.Id, a.Id);
+                    AssertEqual(e.I, a.I);
+                    AssertCollection(e.List, a.List, elementSorter: e=> e.Id, elementAsserter: (ei, ai) =>
+                    {
+                        Assert.Equal(ei.Geometry, ai.Geometry, GeometryComparer.Instance);
+                        Assert.Equal(ei.Point, ai.Point, GeometryComparer.Instance);
+                    });
+                });
+        }
+
         [ConditionalTheory]
         [MemberData(nameof(IsAsyncData))]
         public virtual Task IsEmpty_equal_to_null(bool async)

diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/SpatialQuerySqlServerGeographyTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/SpatialQuerySqlServerGeographyTest.cs
@@ -692,6 +692,21 @@ public override async Task Z(bool async)
 FROM [PointEntity] AS [p]");
         }
 
+        public override async Task XY_with_collection_join(bool async)
+        {
+            await base.XY_with_collection_join(async);
+
+            AssertSql(
+                @"SELECT [t].[Id], [t].[c], [t].[c0], [p0].[Id], [p0].[Geometry], [p0].[Point], [p0].[PointM], [p0].[PointZ], [p0].[PointZM]
+FROM (
+    SELECT TOP(1) [p].[Id], [p].[Point].Long AS [c], [p].[Point].Lat AS [c0]
+    FROM [PointEntity] AS [p]
+    ORDER BY [p].[Id]
+) AS [t]
+LEFT JOIN [PointEntity] AS [p0] ON [t].[Id] = [p0].[Id]
+ORDER BY [t].[Id], [p0].[Id]");
+        }
+
         public override async Task IsEmpty_equal_to_null(bool async)
         {
             await base.IsEmpty_equal_to_null(async);

diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/SpatialQuerySqlServerGeometryTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/SpatialQuerySqlServerGeometryTest.cs
@@ -750,6 +750,21 @@ public override async Task Z(bool async)
 FROM [PointEntity] AS [p]");
         }
 
+        public override async Task XY_with_collection_join(bool async)
+        {
+            await base.XY_with_collection_join(async);
+
+            AssertSql(
+                @"SELECT [t].[Id], [t].[c], [t].[c0], [p0].[Id], [p0].[Geometry], [p0].[Point], [p0].[PointM], [p0].[PointZ], [p0].[PointZM]
+FROM (
+    SELECT TOP(1) [p].[Id], [p].[Point].STX AS [c], [p].[Point].STY AS [c0]
+    FROM [PointEntity] AS [p]
+    ORDER BY [p].[Id]
+) AS [t]
+LEFT JOIN [PointEntity] AS [p0] ON [t].[Id] = [p0].[Id]
+ORDER BY [t].[Id], [p0].[Id]");
+        }
+
         public override async Task IsEmpty_equal_to_null(bool async)
         {
             await base.IsEmpty_equal_to_null(async);