fix: EF 7+ bug around projection composition

Author: yv989c

src/QueryableValues.SqlServer/QueryableValuesEntity.cs

@@ -1,11 +1,20 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace BlazarTech.QueryableValues
 {
     internal class QueryableValuesEntity
     {
+        private static readonly IReadOnlyList<string> DataPropertyNames;
+
         public const string IndexPropertyName = nameof(X);
 
+        static QueryableValuesEntity()
+        {
+            DataPropertyNames = GetDataPropertyNames();
+        }
+
         public int X { get; set; }
 
         public int? I { get; set; }
@@ -150,5 +159,38 @@ internal class QueryableValuesEntity
         public char? C7 { get; set; }
         public char? C8 { get; set; }
         public char? C9 { get; set; }
+
+        private static List<string> GetDataPropertyNames()
+        {
+            var properties = typeof(QueryableValuesEntity).GetProperties();
+            var result = new List<string>(properties.Length);
+
+            foreach (var property in properties)
+            {
+                if (property.Name is IndexPropertyName)
+                {
+                    continue;
+                }
+
+                result.Add(property.Name);
+            }
+
+            return result;
+        }
+
+        internal static IEnumerable<string> GetUnmappedPropertyNames(IReadOnlyList<EntityPropertyMapping> mappings)
+        {
+            var targetProperties = new HashSet<string>(mappings.Select(i => i.Target.Name));
+
+            foreach (var propertyName in DataPropertyNames)
+            {
+                if (targetProperties.Contains(propertyName))
+                {
+                    continue;
+                }
+
+                yield return propertyName;
+            }
+        }
     }
 }

src/QueryableValues.SqlServer/SqlServer/JsonQueryableFactory.cs

@@ -43,6 +43,11 @@ protected override string GetSqlForComplexTypes(IEntityOptionsBuilder entityOpti
                     sb.Append(", [").Append(mapping.Target.Name).Append(']');
                 }
 
+                foreach (var unmappedPropertyName in QueryableValuesEntity.GetUnmappedPropertyNames(mappings))
+                {
+                    sb.Append(", NULL[").Append(unmappedPropertyName).Append(']');
+                }
+
                 sb.AppendLine();
                 sb.Append("FROM OPENJSON({0}) WITH ([").Append(QueryableValuesEntity.IndexPropertyName).Append("] int");
 

src/QueryableValues.SqlServer/SqlServer/XmlQueryableFactory.cs

@@ -41,7 +41,7 @@ protected override string GetSqlForComplexTypes(IEntityOptionsBuilder entityOpti
                 sb
                     .Append("\tI.value('@")
                     .Append(QueryableValuesEntity.IndexPropertyName)
-                    .Append(" cast as xs:integer?', 'int') AS [")
+                    .Append(" cast as xs:integer?', 'int') [")
                     .Append(QueryableValuesEntity.IndexPropertyName)
                     .Append(']');
 
@@ -117,9 +117,11 @@ protected override string GetSqlForComplexTypes(IEntityOptionsBuilder entityOpti
                             throw new NotImplementedException(mapping.TypeName.ToString());
                     }
 
-                    sb.Append(") AS [").Append(targetName).Append(']');
+                    sb.Append(") [").Append(targetName).Append(']');
                 }
 
+                AppendUnmappedProperties(sb, mappings);
+
                 sb.AppendLine();
                 sb.Append("FROM {0}.nodes('/R[1]/V') N(I)").AppendLine();
                 sb.Append("ORDER BY [").Append(QueryableValuesEntity.IndexPropertyName).Append(']');
@@ -130,6 +132,26 @@ protected override string GetSqlForComplexTypes(IEntityOptionsBuilder entityOpti
             {
                 StringBuilderPool.Return(sb);
             }
+
+            static void AppendUnmappedProperties(System.Text.StringBuilder sb, IReadOnlyList< EntityPropertyMapping> mappings)
+            {
+                var hasUnmappedProperty = false;
+
+                foreach (var unmappedPropertyName in QueryableValuesEntity.GetUnmappedPropertyNames(mappings))
+                {
+                    if (hasUnmappedProperty)
+                    {
+                        sb.Append(',');
+                    }
+                    else
+                    {
+                        hasUnmappedProperty = true;
+                        sb.Append(',').AppendLine().Append('\t');
+                    }
+
+                    sb.Append("NULL[").Append(unmappedPropertyName).Append(']');
+                }
+            }
         }
     }
 }