API review changes

Part of #20409

- Use Field instead of FieldInfo in model building
- Change entityTypeName for `IDbSetCache.GetOrAddSet` and similar
- Rename CreateKeyValueReadExpression to CreateKeyValuesExpression
- Make IsQueryableType real internal
- Rename IndexedProperty to IndexerProperty and related
- Seal ExpressionEqualityComparer
- Change ReplacingExpressionVisitor to use `IReadOnlyList<Expression>`
- Use `ETag` instead of `Etag`
- Remove `GetViewOrTableColumnMappings`
- Rename IColumnBase.Type to StoreType

src/EFCore.Cosmos/Extensions/CosmosEntityTypeBuilderExtensions.cs

@@ -261,7 +261,7 @@ public static bool CanSetPartitionKey(
         /// </summary>
         /// <param name="entityTypeBuilder"> The builder for the entity type being configured. </param>
         /// <returns> The same builder instance so that multiple calls can be chained. </returns>
-        public static EntityTypeBuilder UseEtagConcurrency([NotNull] this EntityTypeBuilder entityTypeBuilder)
+        public static EntityTypeBuilder UseETagConcurrency([NotNull] this EntityTypeBuilder entityTypeBuilder)
         {
             Check.NotNull(entityTypeBuilder, nameof(entityTypeBuilder));
 
@@ -276,11 +276,11 @@ public static EntityTypeBuilder UseEtagConcurrency([NotNull] this EntityTypeBuil
         /// </summary>
         /// <param name="entityTypeBuilder"> The builder for the entity type being configured. </param>
         /// <returns> The same builder instance so that multiple calls can be chained. </returns>
-        public static EntityTypeBuilder<TEntity> UseEtagConcurrency<TEntity>([NotNull] this EntityTypeBuilder<TEntity> entityTypeBuilder)
+        public static EntityTypeBuilder<TEntity> UseETagConcurrency<TEntity>([NotNull] this EntityTypeBuilder<TEntity> entityTypeBuilder)
             where TEntity : class
         {
             Check.NotNull(entityTypeBuilder, nameof(entityTypeBuilder));
-            UseEtagConcurrency((EntityTypeBuilder)entityTypeBuilder);
+            UseETagConcurrency((EntityTypeBuilder)entityTypeBuilder);
             return entityTypeBuilder;
         }
     }

src/EFCore.Cosmos/Extensions/CosmosPropertyBuilderExtensions.cs

@@ -93,7 +93,7 @@ public static bool CanSetJsonProperty(
         /// </summary>
         /// <param name="propertyBuilder"> The builder for the property being configured. </param>
         /// <returns> The same builder instance so that multiple calls can be chained. </returns>
-        public static PropertyBuilder IsEtagConcurrency([NotNull] this PropertyBuilder propertyBuilder)
+        public static PropertyBuilder IsETagConcurrency([NotNull] this PropertyBuilder propertyBuilder)
         {
             Check.NotNull(propertyBuilder, nameof(propertyBuilder));
             propertyBuilder
@@ -109,8 +109,8 @@ public static PropertyBuilder IsEtagConcurrency([NotNull] this PropertyBuilder p
         /// <typeparam name="TProperty"> The type of the property being configured. </typeparam>
         /// <param name="propertyBuilder"> The builder for the property being configured. </param>
         /// <returns> The same builder instance so that multiple calls can be chained. </returns>
-        public static PropertyBuilder<TProperty> IsEtagConcurrency<TProperty>(
+        public static PropertyBuilder<TProperty> IsETagConcurrency<TProperty>(
             [NotNull] this PropertyBuilder<TProperty> propertyBuilder)
-            => (PropertyBuilder<TProperty>)IsEtagConcurrency((PropertyBuilder)propertyBuilder);
+            => (PropertyBuilder<TProperty>)IsETagConcurrency((PropertyBuilder)propertyBuilder);
     }
 }

src/EFCore.Cosmos/Internal/CosmosModelValidator.cs

@@ -41,7 +41,7 @@ public override void Validate(IModel model, IDiagnosticsLogger<DbLoggerCategory.
             base.Validate(model, logger);
 
             ValidateSharedContainerCompatibility(model, logger);
-            ValidateOnlyEtagConcurrencyToken(model, logger);
+            ValidateOnlyETagConcurrencyToken(model, logger);
         }
 
         /// <summary>
@@ -181,7 +181,7 @@ protected virtual void ValidateSharedContainerCompatibility(
         ///     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>
-        protected virtual void ValidateOnlyEtagConcurrencyToken(
+        protected virtual void ValidateOnlyETagConcurrencyToken(
             [NotNull] IModel model,
             [NotNull] IDiagnosticsLogger<DbLoggerCategory.Model.Validation> logger)
         {
@@ -195,7 +195,7 @@ protected virtual void ValidateOnlyEtagConcurrencyToken(
                         if (storeName != "_etag")
                         {
                             throw new InvalidOperationException(
-                                CosmosStrings.NonEtagConcurrencyToken(entityType.DisplayName(), storeName));
+                                CosmosStrings.NonETagConcurrencyToken(entityType.DisplayName(), storeName));
                         }
 
                         var etagType = property.GetTypeMapping().Converter?.ProviderClrType ?? property.ClrType;

src/EFCore.Cosmos/Metadata/Internal/CosmosAnnotationNames.cs

@@ -49,6 +49,6 @@ public static class CosmosAnnotationNames
         ///     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 const string ETagName = Prefix + "EtagName";
+        public const string ETagName = Prefix + "ETagName";
     }
 }

src/EFCore.Cosmos/Properties/CosmosStrings.resx

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -132,8 +132,8 @@
   <data name="NoDiscriminatorValue" xml:space="preserve">
     <value>The entity type '{entityType}' is sharing the container '{container}' with other types, but does not have a discriminator value configured.</value>
   </data>
-  <data name="NonEtagConcurrencyToken" xml:space="preserve">
-    <value>The entity type '{entityType}' has property '{property}' as its concurrency token, but only '_etag' is supported. Consider using 'EntityTypeBuilder.UseEtagConcurrency'.</value>
+  <data name="NonETagConcurrencyToken" xml:space="preserve">
+    <value>The entity type '{entityType}' has property '{property}' as its concurrency token, but only '_etag' is supported. Consider using 'EntityTypeBuilder.UseETagConcurrency'.</value>
   </data>
   <data name="NoPartitionKey" xml:space="preserve">
     <value>The entity type '{entityType}' does not have a partition key set, but it is mapped to the container '{container}' shared by entity types with partition keys.</value>

src/EFCore.InMemory/Query/Internal/InMemoryQueryableMethodTranslatingExpressionVisitor.cs

@@ -1099,12 +1099,12 @@ private Expression TryExpand(Expression source, MemberIdentity member)
                         .Select(p => p.ClrType)
                         .Any(t => t.IsNullableType());
 
-                    var outerKey = entityShaperExpression.CreateKeyValueReadExpression(
+                    var outerKey = entityShaperExpression.CreateKeyValuesExpression(
                         navigation.IsOnDependent
                             ? foreignKey.Properties
                             : foreignKey.PrincipalKey.Properties,
                         makeNullable);
-                    var innerKey = innerShapedQuery.ShaperExpression.CreateKeyValueReadExpression(
+                    var innerKey = innerShapedQuery.ShaperExpression.CreateKeyValuesExpression(
                         navigation.IsOnDependent
                             ? foreignKey.PrincipalKey.Properties
                             : foreignKey.Properties,
@@ -1147,12 +1147,12 @@ ProjectionBindingExpression projectionBindingExpression
                         .Select(p => p.ClrType)
                         .Any(t => t.IsNullableType());
 
-                    var outerKey = entityShaperExpression.CreateKeyValueReadExpression(
+                    var outerKey = entityShaperExpression.CreateKeyValuesExpression(
                         navigation.IsOnDependent
                             ? foreignKey.Properties
                             : foreignKey.PrincipalKey.Properties,
                         makeNullable);
-                    var innerKey = innerShapedQuery.ShaperExpression.CreateKeyValueReadExpression(
+                    var innerKey = innerShapedQuery.ShaperExpression.CreateKeyValuesExpression(
                         navigation.IsOnDependent
                             ? foreignKey.PrincipalKey.Properties
                             : foreignKey.Properties,

src/EFCore.Relational/Extensions/RelationalPropertyExtensions.cs

@@ -295,16 +295,6 @@ public static IEnumerable<IColumnMapping> GetTableColumnMappings([NotNull] this
             (IEnumerable<IColumnMapping>)property[RelationalAnnotationNames.TableColumnMappings]
                 ?? Enumerable.Empty<IColumnMapping>();
 
-        /// <summary>
-        ///     Returns the view or table columns to which the property is mapped.
-        /// </summary>
-        /// <param name="property"> The property. </param>
-        /// <returns> The view or table columns to which the property is mapped. </returns>
-        public static IEnumerable<IColumnMappingBase> GetViewOrTableColumnMappings([NotNull] this IProperty property) =>
-            (IEnumerable<IColumnMappingBase>)(property[RelationalAnnotationNames.ViewColumnMappings]
-                ?? property[RelationalAnnotationNames.TableColumnMappings])
-                ?? Enumerable.Empty<IColumnMappingBase>();
-
         /// <summary>
         ///     Returns the view columns to which the property is mapped.
         /// </summary>

src/EFCore.Relational/Metadata/IColumnBase.cs

@@ -19,7 +19,7 @@ public interface IColumnBase : IAnnotatable
         /// <summary>
         ///     Gets the column type.
         /// </summary>
-        string Type { get; }
+        string StoreType { get; }
 
         /// <summary>
         ///     Gets the value indicating whether the column can contain NULL.

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

@@ -26,7 +26,7 @@ public class Column : Annotatable, IColumn
         public Column([NotNull] string name, [CanBeNull] string type, [NotNull] Table table)
         {
             Name = name;
-            Type = type;
+            StoreType = type;
             Table = table;
         }
 
@@ -37,7 +37,7 @@ public Column([NotNull] string name, [CanBeNull] string type, [NotNull] Table ta
         public virtual ITable Table { get; }
 
         /// <inheritdoc/>
-        public virtual string Type { get; }
+        public virtual string StoreType { get; }
 
         /// <inheritdoc/>
         public virtual bool IsNullable { get; set; }

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

@@ -38,7 +38,7 @@ public static string ToDebugString(
 
             builder.Append(column.Name).Append(" (");
 
-            builder.Append(column.Type).Append(")");
+            builder.Append(column.StoreType).Append(")");
 
             if (column.IsNullable)
             {

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

@@ -25,7 +25,7 @@ public class ViewColumn : Annotatable, IViewColumn
         public ViewColumn([NotNull] string name, [NotNull] string type, [NotNull] View view)
         {
             Name = name;
-            Type = type;
+            StoreType = type;
             View = view;
         }
 
@@ -36,7 +36,7 @@ public ViewColumn([NotNull] string name, [NotNull] string type, [NotNull] View v
         public virtual IView View { get; }
 
         /// <inheritdoc/>
-        public virtual string Type { get; }
+        public virtual string StoreType { get; }
 
         /// <inheritdoc/>
         public virtual bool IsNullable { get; set; }

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

@@ -38,7 +38,7 @@ public static string ToDebugString(
 
             builder.Append(column.Name).Append(" (");
 
-            builder.Append(column.Type).Append(")");
+            builder.Append(column.StoreType).Append(")");
 
             if (column.IsNullable)
             {

src/EFCore.Relational/Migrations/Internal/MigrationsModelDiffer.cs

@@ -982,8 +982,8 @@ protected virtual IEnumerable<MigrationOperation> Diff(
             var sourceTypeMapping = sourceMapping.TypeMapping;
             var targetTypeMapping = targetMapping.TypeMapping;
 
-            var sourceColumnType = source.Type ?? sourceTypeMapping.StoreType;
-            var targetColumnType = target.Type ?? targetTypeMapping.StoreType;
+            var sourceColumnType = source.StoreType ?? sourceTypeMapping.StoreType;
+            var targetColumnType = target.StoreType ?? targetTypeMapping.StoreType;
 
             var sourceMigrationsAnnotations = source.GetAnnotations();
             var targetMigrationsAnnotations = target.GetAnnotations();
@@ -1090,7 +1090,7 @@ private void Initialize(
                 = (valueConverter?.ProviderClrType
                     ?? typeMapping.ClrType).UnwrapNullableType();
 
-            columnOperation.ColumnType = column.Type;
+            columnOperation.ColumnType = column.StoreType;
             columnOperation.MaxLength = column.MaxLength;
             columnOperation.Precision = column.Precision;
             columnOperation.Scale = column.Scale;

src/EFCore.Relational/Migrations/MigrationsSqlGenerator.cs

@@ -1433,7 +1433,7 @@ protected virtual string GetColumnType(
                     && operation.IsFixedLength == column.IsFixedLength
                     && operation.IsRowVersion == column.IsRowVersion)
                 {
-                    return column.Type;
+                    return column.StoreType;
                 }
 
                 keyOrIndex = table.UniqueConstraints.Any(u => u.Columns.Contains(column))

src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs

@@ -1184,12 +1184,12 @@ private Expression TryExpand(Expression source, MemberIdentity member)
                     var innerSequenceType = innerShapedQuery.Type.TryGetSequenceType();
                     var correlationPredicateParameter = Expression.Parameter(innerSequenceType);
 
-                    var outerKey = entityShaperExpression.CreateKeyValueReadExpression(
+                    var outerKey = entityShaperExpression.CreateKeyValuesExpression(
                         navigation.IsOnDependent
                             ? foreignKey.Properties
                             : foreignKey.PrincipalKey.Properties,
                         makeNullable);
-                    var innerKey = correlationPredicateParameter.CreateKeyValueReadExpression(
+                    var innerKey = correlationPredicateParameter.CreateKeyValuesExpression(
                         navigation.IsOnDependent
                             ? foreignKey.PrincipalKey.Properties
                             : foreignKey.Properties,
@@ -1245,12 +1245,12 @@ private Expression TryExpand(Expression source, MemberIdentity member)
                             .Select(p => p.ClrType)
                             .Any(t => t.IsNullableType());
 
-                        var outerKey = entityShaperExpression.CreateKeyValueReadExpression(
+                        var outerKey = entityShaperExpression.CreateKeyValuesExpression(
                             navigation.IsOnDependent
                                 ? foreignKey.Properties
                                 : foreignKey.PrincipalKey.Properties,
                             makeNullable);
-                        var innerKey = innerShapedQuery.ShaperExpression.CreateKeyValueReadExpression(
+                        var innerKey = innerShapedQuery.ShaperExpression.CreateKeyValuesExpression(
                             navigation.IsOnDependent
                                 ? foreignKey.PrincipalKey.Properties
                                 : foreignKey.Properties,

src/EFCore.Sqlite.Core/Metadata/Internal/SqliteAnnotationProvider.cs

@@ -47,7 +47,7 @@ public SqliteAnnotationProvider([NotNull] RelationalAnnotationProviderDependenci
         public override IEnumerable<IAnnotation> For(IRelationalModel model)
         {
             if (model.Tables.SelectMany(t => t.Columns).Any(
-                c => SqliteTypeMappingSource.IsSpatialiteType(c.Type)))
+                c => SqliteTypeMappingSource.IsSpatialiteType(c.StoreType)))
             {
                 yield return new Annotation(SqliteAnnotationNames.InitSpatialMetaData, true);
             }