Don't persist keys for embedded entities

src/EFCore.Cosmos/Extensions/CosmosPropertyExtensions.cs

@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System.Linq;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Cosmos.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Metadata;
@@ -20,7 +21,27 @@ public static class CosmosPropertyExtensions
         /// <returns> The property name used when targeting Cosmos. </returns>
         public static string GetCosmosPropertyName([NotNull] this IProperty property) =>
             (string)property[CosmosAnnotationNames.PropertyName]
-            ?? property.Name;
+            ?? GetDefaultPropertyName(property);
+
+        private static string GetDefaultPropertyName(IProperty property)
+        {
+            var entityType = property.DeclaringEntityType;
+            var ownership = entityType.FindOwnership();
+
+            if (ownership != null
+                && !entityType.IsDocumentRoot())
+            {
+                var pk = property.FindContainingPrimaryKey();
+                if (pk != null
+                    && pk.Properties.Count == ownership.Properties.Count + (ownership.IsUnique ? 0 : 1)
+                    && ownership.Properties.All(fkProperty => pk.Properties.Contains(fkProperty)))
+                {
+                    return "";
+                }
+            }
+
+            return property.Name;
+        }
 
         /// <summary>
         ///     Sets the property name used when targeting Cosmos.

src/EFCore.Cosmos/Extensions/CosmosServiceCollectionExtensions.cs

@@ -9,12 +9,14 @@
 using Microsoft.EntityFrameworkCore.Cosmos.Metadata.Conventions.Internal;
 using Microsoft.EntityFrameworkCore.Cosmos.Query.Internal;
 using Microsoft.EntityFrameworkCore.Cosmos.Storage.Internal;
+using Microsoft.EntityFrameworkCore.Cosmos.ValueGeneration.Internal;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata.Conventions.Infrastructure;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Utilities;
+using Microsoft.EntityFrameworkCore.ValueGeneration;
 
 // ReSharper disable once CheckNamespace
 namespace Microsoft.Extensions.DependencyInjection
@@ -53,6 +55,7 @@ public static IServiceCollection AddEntityFrameworkCosmos([NotNull] this IServic
                 .TryAdd<IDbContextTransactionManager, CosmosTransactionManager>()
                 .TryAdd<IModelValidator, CosmosModelValidator>()
                 .TryAdd<IProviderConventionSetBuilder, CosmosConventionSetBuilder>()
+                .TryAdd<IValueGeneratorSelector, CosmosValueGeneratorSelector>()
                 .TryAdd<IDatabaseCreator, CosmosDatabaseCreator>()
                 .TryAdd<IQueryContextFactory, CosmosQueryContextFactory>()
                 .TryAdd<ITypeMappingSource, CosmosTypeMappingSource>()

src/EFCore.Cosmos/Query/Internal/ObjectAccessExpression.cs

@@ -35,6 +35,14 @@ public ObjectAccessExpression(INavigation navigation, Expression accessExpressio
             AccessExpression = accessExpression;
         }
 
+        /// <summary>
+        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+        ///     any release. You should only use it directly in your code with extreme caution and knowing that
+        ///     doing so can result in application failures when updating to a new Entity Framework Core release.
+        /// </summary>
+        public override ExpressionType NodeType => ExpressionType.Extension;
+
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
         ///     the same compatibility standards as public APIs. It may be changed or removed without notice in

src/EFCore.Cosmos/Storage/Internal/CosmosDatabaseCreator.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Cosmos.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Storage;
@@ -55,7 +56,7 @@ public virtual bool EnsureCreated()
             {
                 created |= _cosmosClient.CreateContainerIfNotExists(
                     entityType.GetCosmosContainer(),
-                    entityType.GetCosmosPartitionKeyStoreName());
+                    GetCosmosPartitionKeyStoreName(entityType));
             }
 
             if (created)
@@ -89,7 +90,7 @@ public virtual async Task<bool> EnsureCreatedAsync(CancellationToken cancellatio
             {
                 created |= await _cosmosClient.CreateContainerIfNotExistsAsync(
                     entityType.GetCosmosContainer(),
-                    entityType.GetCosmosPartitionKeyStoreName(),
+                    GetCosmosPartitionKeyStoreName(entityType),
                     cancellationToken);
             }
 
@@ -145,5 +146,21 @@ public virtual bool CanConnect()
         /// </summary>
         public virtual Task<bool> CanConnectAsync(CancellationToken cancellationToken = default)
             => throw new NotImplementedException();
+
+        /// <summary>
+        ///     Returns the store name of the property that is used to store the partition key.
+        /// </summary>
+        /// <param name="entityType"> The entity type to get the partition key property name for. </param>
+        /// <returns> The name of the partition key property. </returns>
+        private static string GetCosmosPartitionKeyStoreName([NotNull] IEntityType entityType)
+        {
+            var name = entityType.GetCosmosPartitionKeyPropertyName();
+            if (name != null)
+            {
+                return entityType.FindProperty(name).GetCosmosPropertyName();
+            }
+
+            return CosmosClientWrapper.DefaultPartitionKey;
+        }
     }
 }

src/EFCore.Cosmos/Update/Internal/DocumentSource.cs

@@ -71,6 +71,10 @@ public virtual JObject CreateDocument(IUpdateEntry entry)
                 {
                     document[storeName] = ConvertPropertyValue(property, entry.GetCurrentValue(property));
                 }
+                else if (entry.HasTemporaryValue(property))
+                {
+                    ((InternalEntityEntry)entry)[property] = entry.GetCurrentValue(property);
+                }
             }
 
             foreach (var ownedNavigation in entry.EntityType.GetNavigations())
@@ -130,6 +134,10 @@ public virtual JObject UpdateDocument(JObject document, IUpdateEntry entry)
                         document[storeName] = ConvertPropertyValue(property, entry.GetCurrentValue(property));
                         anyPropertyUpdated = true;
                     }
+                    else if (entry.HasTemporaryValue(property))
+                    {
+                        ((InternalEntityEntry)entry)[property] = entry.GetCurrentValue(property);
+                    }
                 }
             }
 

src/EFCore.Cosmos/ValueGeneration/Internal/CosmosValueGeneratorSelector.cs

@@ -0,0 +1,31 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.ValueGeneration;
+using Microsoft.EntityFrameworkCore.ValueGeneration.Internal;
+
+namespace Microsoft.EntityFrameworkCore.Cosmos.ValueGeneration.Internal
+{
+    public class CosmosValueGeneratorSelector : ValueGeneratorSelector
+    {
+        public CosmosValueGeneratorSelector(ValueGeneratorSelectorDependencies dependencies)
+            : base(dependencies)
+        {
+        }
+
+        public override ValueGenerator Create(IProperty property, IEntityType entityType)
+        {
+            var type = property.ClrType.UnwrapNullableType().UnwrapEnumType();
+
+            if (property.GetCosmosPropertyName() == ""
+                && type == typeof(int))
+            {
+                return new TemporaryIntValueGenerator();
+            }
+
+            return base.Create(property, entityType);
+        }
+    }
+}

src/EFCore.Cosmos/ValueGeneration/Internal/IdValueGenerator.cs

@@ -4,7 +4,6 @@
 using System.Collections;
 using System.Linq;
 using System.Text;
-using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Cosmos.Storage.Internal;
 using Microsoft.EntityFrameworkCore.ValueGeneration;

src/EFCore.Relational/Query/Internal/FromSqlParameterApplyingExpressionVisitor.cs

@@ -19,16 +19,16 @@ private class FromSqlParameterApplyingExpressionVisitor : ExpressionVisitor
             private readonly IDictionary<FromSqlExpression, Expression> _visitedFromSqlExpressions
                 = new Dictionary<FromSqlExpression, Expression>(ReferenceEqualityComparer.Instance);
 
-            private readonly ISqlExpressionFactory _SqlExpressionFactory;
+            private readonly ISqlExpressionFactory _sqlExpressionFactory;
             private readonly ParameterNameGenerator _parameterNameGenerator;
             private readonly IReadOnlyDictionary<string, object> _parametersValues;
 
             public FromSqlParameterApplyingExpressionVisitor(
-                ISqlExpressionFactory _sqlExpressionFactory,
+                ISqlExpressionFactory sqlExpressionFactory,
                 ParameterNameGenerator parameterNameGenerator,
                 IReadOnlyDictionary<string, object> parametersValues)
             {
-                _SqlExpressionFactory = _sqlExpressionFactory;
+                _sqlExpressionFactory = sqlExpressionFactory;
                 _parameterNameGenerator = parameterNameGenerator;
                 _parametersValues = parametersValues;
             }
@@ -67,7 +67,7 @@ public override Expression Visit(Expression expression)
                                             new TypeMappedRelationalParameter(
                                                 parameterName,
                                                 parameterName,
-                                                _SqlExpressionFactory.GetTypeMappingForValue(parameterValues[i]),
+                                                _sqlExpressionFactory.GetTypeMappingForValue(parameterValues[i]),
                                                 parameterValues[i]?.GetType().IsNullableType()));
                                     }
                                 }

src/EFCore.Relational/Query/Internal/ParameterValueBasedSelectExpressionOptimizer.cs

@@ -32,7 +32,6 @@ public SelectExpression Optimize(SelectExpression selectExpression, IReadOnlyDic
                     _parameterNameGeneratorFactory.Create(),
                     parametersValues).Visit(query);
 
-
                 return (SelectExpression)query;
             }
         }

src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs

@@ -5,6 +5,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Reflection;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Metadata;
@@ -86,7 +87,7 @@ public virtual SqlExpression TranslateAverage(Expression expression)
             return inputType == typeof(float)
                 ? _sqlExpressionFactory.Convert(
                         _sqlExpressionFactory.Function(
-                            "AVG", new[] { sqlExpression }, typeof(double), null),
+                            "AVG", new[] { sqlExpression }, typeof(double)),
                         sqlExpression.Type,
                         sqlExpression.TypeMapping)
                 : (SqlExpression)_sqlExpressionFactory.Function(

src/EFCore/Query/NavigationExpansion/Internal/NavigationExpansionHelpers.cs

@@ -234,10 +234,7 @@ public static Expression CreateKeyAccessExpression(
                     AnonymousObject.AnonymousObjectCtor,
                     Expression.NewArrayInit(
                         typeof(object),
-                        properties
-                            .Select(p => Expression.Convert(CreatePropertyExpression(target, p, addNullCheck), typeof(object)))
-                            .Cast<Expression>()
-                            .ToArray()));
+                        properties.Select(p => Expression.Convert(CreatePropertyExpression(target, p, addNullCheck), typeof(object)))));
 
         private static Expression CreatePropertyExpression(Expression target, IProperty property, bool addNullCheck)
         {

test/EFCore.Cosmos.FunctionalTests/NestedDocumentsTest.cs

@@ -80,8 +80,7 @@ public virtual async Task Can_update_owner_with_dependents()
             }
         }
 
-        // #12086
-        //[ConditionalFact]
+        [ConditionalFact]
         public virtual async Task Can_add_collection_dependent_to_owner()
         {
             await using (var testDatabase = CreateTestStore())
@@ -158,9 +157,8 @@ public virtual async Task Can_add_collection_dependent_to_owner()
                     var json = context.Entry(people[1]).Property<JObject>("__jObject").CurrentValue;
                     var jsonAddress = (JObject)((JArray)json["Stored Addresses"])[0];
                     Assert.Equal("Second", jsonAddress[nameof(Address.Street)]);
-                    // Uncomment when issue #13578 is fixed
-                    //Assert.Equal(2, jsonAddress["unmappedId"]);
-                    //Assert.Equal(2, jsonAddress.Count);
+                    Assert.Equal(2, jsonAddress["unmappedId"]);
+                    Assert.Equal(2, jsonAddress.Count);
 
                     addresses = people[2].Addresses.ToList();
                     Assert.Equal(3, addresses.Count);
@@ -192,8 +190,7 @@ public virtual async Task Can_query_just_nested_reference()
             }
         }
 
-        // #12086
-        //[ConditionalFact]
+        [ConditionalFact]
         public virtual async Task Can_query_just_nested_collection()
         {
             await using (var testDatabase = CreateTestStore())

test/EFCore.SqlServer.FunctionalTests/BuiltInDataTypesSqlServerTest.cs

@@ -11,7 +11,6 @@
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.TestUtilities;
-using Microsoft.EntityFrameworkCore.TestUtilities.Xunit;
 using Xunit;
 using Xunit.Abstractions;