Remove TypeMapping annotation

src/EFCore.Relational/Metadata/Internal/ColumnMappingBaseComparer.cs

@@ -34,7 +34,7 @@ private ColumnMappingBaseComparer()
         /// </summary>
         public int Compare(IColumnMappingBase x, IColumnMappingBase y)
         {
-            var result = y.Column.IsNullable.CompareTo(x.Column.IsNullable);
+            var result = y.Property.IsPrimaryKey().CompareTo(x.Property.IsPrimaryKey());
             if (result != 0)
             {
                 return result;

src/EFCore.Relational/Metadata/Internal/ColumnNameComparer.cs

@@ -0,0 +1,77 @@
+// 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 System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.EntityFrameworkCore.Metadata.Internal
+{
+    /// <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 sealed class ColumnNameComparer : IComparer<string>
+    {
+        private readonly Table _table;
+
+        /// <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 ColumnNameComparer([NotNull] Table table)
+        {
+            _table = table;
+        }
+
+        /// <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 int Compare(string x, string y)
+        {
+            var xIndex = -1;
+            var yIndex = -1;
+
+            var columns = _table.PrimaryKey?.Columns;
+            if (columns != null)
+            {
+                for (var i = 0; i < columns.Count; i++)
+                {
+                    var name = columns[i].Name;
+                    if (name == x)
+                    {
+                        xIndex = i;
+                    }
+
+                    if (name == y)
+                    {
+                        yIndex = i;
+                    }
+                }
+            }
+
+            if (xIndex == -1
+                && yIndex == -1)
+            {
+                return StringComparer.Ordinal.Compare(x, y);
+            }
+
+            if (xIndex > -1
+                && yIndex > -1)
+            {
+                return xIndex - yIndex;
+            }
+
+            return xIndex > yIndex
+                ? -1
+                : 1;
+        }
+    }
+}

src/EFCore.Relational/Metadata/Internal/Table.cs

@@ -1,7 +1,6 @@
 // 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 System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -18,6 +17,8 @@ namespace Microsoft.EntityFrameworkCore.Metadata.Internal
     /// </summary>
     public class Table : TableBase, ITable
     {
+        private UniqueConstraint _primaryKey;
+
         /// <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
@@ -27,6 +28,7 @@ public class Table : TableBase, ITable
         public Table([NotNull] string name, [CanBeNull] string schema, [NotNull] RelationalModel model)
             : base(name, schema, model)
         {
+            Columns = new SortedDictionary<string, IColumnBase>(new ColumnNameComparer(this));
         }
 
         /// <summary>
@@ -44,7 +46,47 @@ public Table([NotNull] string name, [CanBeNull] string schema, [NotNull] Relatio
         ///     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 virtual UniqueConstraint PrimaryKey { get; [param: NotNull] set; }
+        public virtual UniqueConstraint PrimaryKey
+        {
+            get => _primaryKey; [param: NotNull]
+            set
+            {
+                var oldPrimaryKey = _primaryKey;
+                if (oldPrimaryKey != null)
+                {
+                    foreach (var column in oldPrimaryKey.Columns)
+                    {
+                        Columns.Remove(column.Name);
+                    }
+                }
+
+                if (value != null)
+                {
+                    foreach (var column in value.Columns)
+                    {
+                        Columns.Remove(column.Name);
+                    }
+                }
+
+                _primaryKey = value;
+
+                if (oldPrimaryKey != null)
+                {
+                    foreach (var column in oldPrimaryKey.Columns)
+                    {
+                        Columns.TryAdd(column.Name, column);
+                    }
+                }
+
+                if (value != null)
+                {
+                    foreach (var column in value.Columns)
+                    {
+                        Columns.TryAdd(column.Name, column);
+                    }
+                }
+            }
+        }
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore.Relational/Metadata/Internal/TableBase.cs

@@ -62,7 +62,7 @@ public TableBase([NotNull] string name, [CanBeNull] string schema, [NotNull] Rel
         ///     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 virtual SortedDictionary<string, IColumnBase> Columns { get; }
+        public virtual SortedDictionary<string, IColumnBase> Columns { get; [param: NotNull] protected set; }
             = new SortedDictionary<string, IColumnBase>(StringComparer.Ordinal);
 
         /// <inheritdoc/>

src/EFCore.Relational/Update/ModificationCommand.cs

@@ -284,17 +284,27 @@ private IReadOnlyList<ColumnModification> GenerateColumnModifications()
                     && (entry.EntityState == EntityState.Deleted
                         || entry.EntityState == EntityState.Added);
 
-                foreach (var property in entry.EntityType.GetProperties())
+                ITableMappingBase tableMapping = null;
+                foreach (var mapping in entry.EntityType.GetTableMappings())
                 {
-                    var columnMapping = property.GetTableColumnMappings()
-                           .Where(m => m.TableMapping.Table.Name == TableName && m.TableMapping.Table.Schema == Schema)
-                           .FirstOrDefault();
-                    if (columnMapping == null)
+                    var table = ((ITableMappingBase)mapping).Table;
+                    if (table.Name == TableName
+                        && table.Schema == Schema)
                     {
-                        continue;
+                        tableMapping = mapping;
+                        break;
                     }
+                }
 
-                    var column = columnMapping.Column;
+                if (tableMapping == null)
+                {
+                    continue;
+                }
+
+                foreach (var columnMapping in tableMapping.ColumnMappings)
+                {
+                    var property = columnMapping.Property;
+                    var column = (IColumn)columnMapping.Column;
                     var isKey = property.IsPrimaryKey();
                     var isCondition = !adding && (isKey || property.IsConcurrencyToken);
                     var readValue = state != EntityState.Deleted && entry.IsStoreGenerated(property);

src/EFCore/Extensions/ConventionPropertyExtensions.cs

@@ -8,6 +8,7 @@
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Microsoft.EntityFrameworkCore.ValueGeneration;
 
@@ -81,13 +82,26 @@ public static IConventionKey FindContainingPrimaryKey([NotNull] this IConvention
         public static IEnumerable<IConventionKey> GetContainingKeys([NotNull] this IConventionProperty property)
             => ((Property)property).GetContainingKeys();
 
+        /// <summary>
+        ///     Sets the <see cref="CoreTypeMapping" /> for the given property
+        /// </summary>
+        /// <param name="property"> The property. </param>
+        /// <param name="typeMapping"> The <see cref="CoreTypeMapping" /> for this property. </param>
+        /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
+        public static CoreTypeMapping SetTypeMapping(
+            [NotNull] this IConventionProperty property,
+            [NotNull] CoreTypeMapping typeMapping,
+            bool fromDataAnnotation = false)
+            => ((Property)property).SetTypeMapping(
+                typeMapping, fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention);
+
         /// <summary>
         ///     Gets the <see cref="ConfigurationSource" /> for <see cref="PropertyExtensions.FindTypeMapping(IProperty)" />.
         /// </summary>
         /// <param name="property"> The property. </param>
         /// <returns> The <see cref="ConfigurationSource" /> for <see cref="PropertyExtensions.FindTypeMapping(IProperty)" />. </returns>
         public static ConfigurationSource? GetTypeMappingConfigurationSource([NotNull] this IConventionProperty property)
-            => property.FindAnnotation(CoreAnnotationNames.TypeMapping)?.GetConfigurationSource();
+            => ((Property)property).GetTypeMappingConfigurationSource();
 
         /// <summary>
         ///     Sets the maximum length of data that is allowed in this property. For example, if the property is a <see cref="string" /> '
@@ -115,7 +129,7 @@ public static IEnumerable<IConventionKey> GetContainingKeys([NotNull] this IConv
         ///     For example, if the property is a <see cref="decimal" />
         ///     then this is the maximum number of digits.
         /// </summary>
-        /// <param name="property"> The property to get the precision of. </param>
+        /// <param name="property"> The property. </param>
         /// <param name="precision"> The maximum number of digits that is allowed in this property. </param>
         /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
         public static int? SetPrecision([NotNull] this IConventionProperty property, int? precision, bool fromDataAnnotation = false)
@@ -135,7 +149,7 @@ public static IEnumerable<IConventionKey> GetContainingKeys([NotNull] this IConv
         ///     For example, if the property is a <see cref="decimal" />
         ///     then this is the maximum number of decimal places.
         /// </summary>
-        /// <param name="property"> The property to get the precision of. </param>
+        /// <param name="property"> The property. </param>
         /// <param name="scale"> The maximum number of decimal places that is allowed in this property. </param>
         /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
         public static int? SetScale([NotNull] this IConventionProperty property, int? scale, bool fromDataAnnotation = false)

src/EFCore/Extensions/MutablePropertyExtensions.cs

@@ -8,6 +8,7 @@
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Microsoft.EntityFrameworkCore.ValueGeneration;
 
@@ -198,6 +199,16 @@ public static void SetValueConverter([NotNull] this IMutableProperty property, [
         public static void SetProviderClrType([NotNull] this IMutableProperty property, [CanBeNull] Type providerClrType)
             => property.AsProperty().SetProviderClrType(providerClrType, ConfigurationSource.Explicit);
 
+        /// <summary>
+        ///     Sets the <see cref="CoreTypeMapping" /> for the given property
+        /// </summary>
+        /// <param name="property"> The property. </param>
+        /// <param name="typeMapping"> The <see cref="CoreTypeMapping" /> for this property. </param>
+        public static CoreTypeMapping SetTypeMapping(
+            [NotNull] this IMutableProperty property,
+            [NotNull] CoreTypeMapping typeMapping)
+            => ((Property)property).SetTypeMapping(typeMapping,  ConfigurationSource.Explicit);
+
         /// <summary>
         ///     Sets the custom <see cref="ValueComparer" /> for this property.
         /// </summary>

src/EFCore/Extensions/PropertyExtensions.cs

@@ -33,8 +33,7 @@ public static class PropertyExtensions
         /// <returns> The type mapping. </returns>
         public static CoreTypeMapping GetTypeMapping([NotNull] this IProperty property)
         {
-            var mapping = (CoreTypeMapping)property[CoreAnnotationNames.TypeMapping];
-
+            var mapping = ((Property)property).TypeMapping;
             if (mapping == null)
             {
                 throw new InvalidOperationException(
@@ -50,7 +49,7 @@ public static CoreTypeMapping GetTypeMapping([NotNull] this IProperty property)
         /// <param name="property"> The property. </param>
         /// <returns> The type mapping, or <see langword="null"/> if none was found. </returns>
         public static CoreTypeMapping FindTypeMapping([NotNull] this IProperty property)
-            => (CoreTypeMapping)property[CoreAnnotationNames.TypeMapping];
+            => ((Property)property).TypeMapping;
 
         /// <summary>
         ///     Finds the first principal property that the given property is constrained by
@@ -124,15 +123,15 @@ private static void AddPrincipals(IProperty property, List<IProperty> visited)
         /// <param name="property"> The property to check. </param>
         /// <returns> <see langword="true"/> if the property is used as a foreign key, otherwise <see langword="false"/>. </returns>
         public static bool IsForeignKey([NotNull] this IProperty property)
-            => Check.NotNull(property, nameof(property)).AsProperty().ForeignKeys != null;
+            => Check.NotNull((Property)property, nameof(property)).ForeignKeys != null;
 
         /// <summary>
         ///     Gets a value indicating whether this property is used as an index (or part of a composite index).
         /// </summary>
         /// <param name="property"> The property to check. </param>
         /// <returns> <see langword="true"/> if the property is used as an index, otherwise <see langword="false"/>. </returns>
         public static bool IsIndex([NotNull] this IProperty property)
-            => Check.NotNull(property, nameof(property)).AsProperty().Indexes != null;
+            => Check.NotNull((Property)property, nameof(property)).Indexes != null;
 
         /// <summary>
         ///     Gets a value indicating whether this property is used as a unique index (or part of a unique composite index).
@@ -157,7 +156,7 @@ public static bool IsPrimaryKey([NotNull] this IProperty property)
         /// <param name="property"> The property to check. </param>
         /// <returns> <see langword="true"/> if the property is used as a key, otherwise <see langword="false"/>. </returns>
         public static bool IsKey([NotNull] this IProperty property)
-            => Check.NotNull(property, nameof(property)).AsProperty().Keys != null;
+            => Check.NotNull((Property)property, nameof(property)).Keys != null;
 
         /// <summary>
         ///     Gets all foreign keys that use this property (including composite foreign keys in which this property
@@ -166,7 +165,7 @@ public static bool IsKey([NotNull] this IProperty property)
         /// <param name="property"> The property to get foreign keys for. </param>
         /// <returns> The foreign keys that use this property. </returns>
         public static IEnumerable<IForeignKey> GetContainingForeignKeys([NotNull] this IProperty property)
-            => Check.NotNull(property, nameof(property)).AsProperty().GetContainingForeignKeys();
+            => Check.NotNull((Property)property, nameof(property)).GetContainingForeignKeys();
 
         /// <summary>
         ///     Gets all indexes that use this property (including composite indexes in which this property
@@ -175,7 +174,7 @@ public static IEnumerable<IForeignKey> GetContainingForeignKeys([NotNull] this I
         /// <param name="property"> The property to get indexes for. </param>
         /// <returns> The indexes that use this property. </returns>
         public static IEnumerable<IIndex> GetContainingIndexes([NotNull] this IProperty property)
-            => Check.NotNull(property, nameof(property)).AsProperty().GetContainingIndexes();
+            => Check.NotNull((Property)property, nameof(property)).GetContainingIndexes();
 
         /// <summary>
         ///     Gets the primary key that uses this property (including a composite primary key in which this property
@@ -184,7 +183,7 @@ public static IEnumerable<IIndex> GetContainingIndexes([NotNull] this IProperty
         /// <param name="property"> The property to get primary key for. </param>
         /// <returns> The primary that use this property, or <see langword="null"/> if it is not part of the primary key. </returns>
         public static IKey FindContainingPrimaryKey([NotNull] this IProperty property)
-            => Check.NotNull(property, nameof(property)).AsProperty().PrimaryKey;
+            => Check.NotNull((Property)property, nameof(property)).PrimaryKey;
 
         /// <summary>
         ///     Gets all primary or alternate keys that use this property (including composite keys in which this property
@@ -193,7 +192,7 @@ public static IKey FindContainingPrimaryKey([NotNull] this IProperty property)
         /// <param name="property"> The property to get primary and alternate keys for. </param>
         /// <returns> The primary and alternate keys that use this property. </returns>
         public static IEnumerable<IKey> GetContainingKeys([NotNull] this IProperty property)
-            => Check.NotNull(property, nameof(property)).AsProperty().GetContainingKeys();
+            => Check.NotNull((Property)property, nameof(property)).GetContainingKeys();
 
         /// <summary>
         ///     Gets the maximum length of data that is allowed in this property. For example, if the property is a <see cref="string" /> '