From 30328a2bc454e320f3858c745e35268b7586ded6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2020 21:15:05 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/runtime build 20200922.3 (#22670) [release/5.0-rc2] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++++----------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44996990ff6..6debe9f8917 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,53 +1,53 @@ - + https://github.com/dotnet/runtime - c4c136670f568ffcb73b40d836982825548ed6bc + 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b - + https://github.com/dotnet/runtime - c4c136670f568ffcb73b40d836982825548ed6bc + 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b - + https://github.com/dotnet/runtime - c4c136670f568ffcb73b40d836982825548ed6bc + 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b - + https://github.com/dotnet/runtime - c4c136670f568ffcb73b40d836982825548ed6bc + 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b - + https://github.com/dotnet/runtime - c4c136670f568ffcb73b40d836982825548ed6bc + 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b - + https://github.com/dotnet/runtime - c4c136670f568ffcb73b40d836982825548ed6bc + 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b - + https://github.com/dotnet/runtime - c4c136670f568ffcb73b40d836982825548ed6bc + 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b - + https://github.com/dotnet/runtime - c4c136670f568ffcb73b40d836982825548ed6bc + 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b - + https://github.com/dotnet/runtime - c4c136670f568ffcb73b40d836982825548ed6bc + 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b - + https://github.com/dotnet/runtime - c4c136670f568ffcb73b40d836982825548ed6bc + 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b - + https://github.com/dotnet/runtime - c4c136670f568ffcb73b40d836982825548ed6bc + 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b - + https://github.com/dotnet/runtime - c4c136670f568ffcb73b40d836982825548ed6bc + 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 624eaef9961..739d21e0871 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,18 +15,18 @@ False - 5.0.0-rc.2.20471.13 - 5.0.0-rc.2.20471.13 - 5.0.0-rc.2.20471.13 - 5.0.0-rc.2.20471.13 - 5.0.0-rc.2.20471.13 - 5.0.0-rc.2.20471.13 - 5.0.0-rc.2.20471.13 - 5.0.0-rc.2.20471.13 - 5.0.0-rc.2.20471.13 - 5.0.0-rc.2.20471.13 - 5.0.0-rc.2.20471.13 - 5.0.0-rc.2.20471.13 + 5.0.0-rc.2.20472.3 + 5.0.0-rc.2.20472.3 + 5.0.0-rc.2.20472.3 + 5.0.0-rc.2.20472.3 + 5.0.0-rc.2.20472.3 + 5.0.0-rc.2.20472.3 + 5.0.0-rc.2.20472.3 + 5.0.0-rc.2.20472.3 + 5.0.0-rc.2.20472.3 + 5.0.0-rc.2.20472.3 + 5.0.0-rc.2.20472.3 + 5.0.0-rc.2.20472.3 3.7.0 From 81935aeb7b0c5cf42f4d877d6a3a4818007b1ff5 Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Tue, 22 Sep 2020 17:53:15 -0700 Subject: [PATCH 2/4] Undo GetColumnName behavior change (#22672) Fixes #22608 --- .../Internal/CSharpEntityTypeGenerator.cs | 2 +- .../Design/AnnotationCodeGenerator.cs | 2 +- .../RelationalForeignKeyExtensions.cs | 2 +- .../Extensions/RelationalIndexExtensions.cs | 2 +- .../Extensions/RelationalKeyExtensions.cs | 2 +- .../RelationalPropertyExtensions.cs | 34 ++++++++++++++++--- .../Metadata/Internal/RelationalModel.cs | 2 +- .../Migrations/HistoryRepository.cs | 4 +-- .../Internal/CSharpEntityTypeGeneratorTest.cs | 4 +-- .../RelationalScaffoldingModelFactoryTest.cs | 16 ++++----- ...leSharingConcurrencyTokenConventionTest.cs | 8 ++--- .../RelationalBuilderExtensionsTest.cs | 2 +- ...RelationalMetadataBuilderExtensionsTest.cs | 4 +-- .../RelationalMetadataExtensionsTest.cs | 6 ++-- .../Metadata/RelationalModelTest.cs | 34 +++++++++++-------- ...lationalPropertyAttributeConventionTest.cs | 8 ++--- .../DataAnnotationSqlServerTest.cs | 8 ++--- ...eteMappingInheritanceQuerySqlServerTest.cs | 14 ++++---- .../Query/InheritanceQuerySqlServerTest.cs | 14 ++++---- .../UpdatesSqlServerTest.cs | 4 +-- .../SqlServerMetadataExtensionsTest.cs | 8 ++--- .../SqlServerModelBuilderGenericTest.cs | 10 +++--- .../DataAnnotationSqliteTest.cs | 6 ++-- 23 files changed, 113 insertions(+), 83 deletions(-) diff --git a/src/EFCore.Design/Scaffolding/Internal/CSharpEntityTypeGenerator.cs b/src/EFCore.Design/Scaffolding/Internal/CSharpEntityTypeGenerator.cs index 505e4bb3337..ab26635d4d0 100644 --- a/src/EFCore.Design/Scaffolding/Internal/CSharpEntityTypeGenerator.cs +++ b/src/EFCore.Design/Scaffolding/Internal/CSharpEntityTypeGenerator.cs @@ -314,7 +314,7 @@ private void GenerateKeyAttribute(IProperty property) private void GenerateColumnAttribute(IProperty property) { - var columnName = property.GetColumnName(); + var columnName = property.GetColumnBaseName(); var columnType = property.GetConfiguredColumnType(); var delimitedColumnName = columnName != null && columnName != property.Name ? _code.Literal(columnName) : null; diff --git a/src/EFCore.Relational/Design/AnnotationCodeGenerator.cs b/src/EFCore.Relational/Design/AnnotationCodeGenerator.cs index b35cd851d77..e5b5a5fbbbd 100644 --- a/src/EFCore.Relational/Design/AnnotationCodeGenerator.cs +++ b/src/EFCore.Relational/Design/AnnotationCodeGenerator.cs @@ -92,7 +92,7 @@ public virtual void RemoveAnnotationsHandledByConventions( IProperty property, IDictionary annotations) { - var columnName = property.GetColumnName(); + var columnName = property.GetColumnBaseName(); if (columnName == property.Name) { annotations.Remove(RelationalAnnotationNames.ColumnName); diff --git a/src/EFCore.Relational/Extensions/RelationalForeignKeyExtensions.cs b/src/EFCore.Relational/Extensions/RelationalForeignKeyExtensions.cs index b28a5228faa..726191d1889 100644 --- a/src/EFCore.Relational/Extensions/RelationalForeignKeyExtensions.cs +++ b/src/EFCore.Relational/Extensions/RelationalForeignKeyExtensions.cs @@ -65,7 +65,7 @@ public static string GetDefaultName([NotNull] this IForeignKey foreignKey) .Append("_") .Append(principalTableName) .Append("_") - .AppendJoin(foreignKey.Properties.Select(p => p.GetColumnName()), "_") + .AppendJoin(foreignKey.Properties.Select(p => p.GetColumnBaseName()), "_") .ToString(); return Uniquifier.Truncate(name, foreignKey.DeclaringEntityType.Model.GetMaxIdentifierLength()); diff --git a/src/EFCore.Relational/Extensions/RelationalIndexExtensions.cs b/src/EFCore.Relational/Extensions/RelationalIndexExtensions.cs index 4dc0ed3e130..818861c8a80 100644 --- a/src/EFCore.Relational/Extensions/RelationalIndexExtensions.cs +++ b/src/EFCore.Relational/Extensions/RelationalIndexExtensions.cs @@ -61,7 +61,7 @@ public static string GetDefaultDatabaseName([NotNull] this IIndex index) .Append("IX_") .Append(tableName) .Append("_") - .AppendJoin(index.Properties.Select(p => p.GetColumnName()), "_") + .AppendJoin(index.Properties.Select(p => p.GetColumnBaseName()), "_") .ToString(); return Uniquifier.Truncate(baseName, index.DeclaringEntityType.Model.GetMaxIdentifierLength()); diff --git a/src/EFCore.Relational/Extensions/RelationalKeyExtensions.cs b/src/EFCore.Relational/Extensions/RelationalKeyExtensions.cs index a790cc808b7..0278f80e95d 100644 --- a/src/EFCore.Relational/Extensions/RelationalKeyExtensions.cs +++ b/src/EFCore.Relational/Extensions/RelationalKeyExtensions.cs @@ -54,7 +54,7 @@ public static string GetDefaultName([NotNull] this IKey key) .Append("AK_") .Append(tableName) .Append("_") - .AppendJoin(key.Properties.Select(p => p.GetColumnName()), "_") + .AppendJoin(key.Properties.Select(p => p.GetColumnBaseName()), "_") .ToString(); } diff --git a/src/EFCore.Relational/Extensions/RelationalPropertyExtensions.cs b/src/EFCore.Relational/Extensions/RelationalPropertyExtensions.cs index 8db0d6cc743..e8b21818cc6 100644 --- a/src/EFCore.Relational/Extensions/RelationalPropertyExtensions.cs +++ b/src/EFCore.Relational/Extensions/RelationalPropertyExtensions.cs @@ -24,16 +24,28 @@ namespace Microsoft.EntityFrameworkCore public static class RelationalPropertyExtensions { /// - /// Returns the name of the column to which the property is mapped. + /// Returns the name of the table column to which the property is mapped. /// /// The property. - /// The name of the column to which the property is mapped. + /// The name of the table column to which the property is mapped. + [Obsolete("Use the overload that takes a StoreObjectIdentifier")] public static string GetColumnName([NotNull] this IProperty property) { var annotation = property.FindAnnotation(RelationalAnnotationNames.ColumnName); return annotation != null ? (string)annotation.Value : property.GetDefaultColumnName(); } + /// + /// Returns the base name of the column to which the property would be mapped. + /// + /// The property. + /// The the base name of the column to which the property would be mapped. + public static string GetColumnBaseName([NotNull] this IProperty property) + { + var annotation = property.FindAnnotation(RelationalAnnotationNames.ColumnName); + return annotation != null ? (string)annotation.Value : property.GetDefaultColumnBaseName(); + } + /// /// Returns the name of the column to which the property is mapped for a particular table. /// @@ -86,11 +98,23 @@ public static string GetColumnName([NotNull] this IProperty property, in StoreOb } /// - /// Returns the default column name to which the property would be mapped. + /// Returns the default table column name to which the property would be mapped. /// /// The property. - /// The default column name to which the property would be mapped. + /// The default table column name to which the property would be mapped. + [Obsolete("Use the overload that takes a StoreObjectIdentifier")] public static string GetDefaultColumnName([NotNull] this IProperty property) + { + var table = StoreObjectIdentifier.Create(property.DeclaringEntityType, StoreObjectType.Table); + return table == null ? property.GetDefaultColumnBaseName() : property.GetDefaultColumnName(table.Value); + } + + /// + /// Returns the default base name of the column to which the property would be mapped + /// + /// The property. + /// The default base column name to which the property would be mapped. + public static string GetDefaultColumnBaseName([NotNull] this IProperty property) => Uniquifier.Truncate(property.Name, property.DeclaringEntityType.Model.GetMaxIdentifierLength()); /// @@ -170,7 +194,7 @@ public static string GetDefaultColumnName([NotNull] this IProperty property, in entityType = ownerType; } - var baseName = property.GetDefaultColumnName(); + var baseName = property.GetDefaultColumnBaseName(); if (builder == null) { return baseName; diff --git a/src/EFCore.Relational/Metadata/Internal/RelationalModel.cs b/src/EFCore.Relational/Metadata/Internal/RelationalModel.cs index 025f8ecb9f9..a4df7ba401f 100644 --- a/src/EFCore.Relational/Metadata/Internal/RelationalModel.cs +++ b/src/EFCore.Relational/Metadata/Internal/RelationalModel.cs @@ -242,7 +242,7 @@ private static void AddDefaultMappings(RelationalModel databaseModel, IConventio foreach (var property in entityType.GetProperties()) { - var columnName = property.GetColumnName(); + var columnName = property.GetColumnBaseName(); if (columnName == null) { continue; diff --git a/src/EFCore.Relational/Migrations/HistoryRepository.cs b/src/EFCore.Relational/Migrations/HistoryRepository.cs index 1ce51551309..e5147b40801 100644 --- a/src/EFCore.Relational/Migrations/HistoryRepository.cs +++ b/src/EFCore.Relational/Migrations/HistoryRepository.cs @@ -88,7 +88,7 @@ protected virtual string MigrationIdColumnName => _migrationIdColumnName ??= EnsureModel() .FindEntityType(typeof(HistoryRow)) .FindProperty(nameof(HistoryRow.MigrationId)) - .GetColumnName(); + .GetColumnBaseName(); private IModel EnsureModel() { @@ -119,7 +119,7 @@ protected virtual string ProductVersionColumnName => _productVersionColumnName ??= EnsureModel() .FindEntityType(typeof(HistoryRow)) .FindProperty(nameof(HistoryRow.ProductVersion)) - .GetColumnName(); + .GetColumnBaseName(); /// /// Overridden by database providers to generate SQL that tests for existence of the history table. diff --git a/test/EFCore.Design.Tests/Scaffolding/Internal/CSharpEntityTypeGeneratorTest.cs b/test/EFCore.Design.Tests/Scaffolding/Internal/CSharpEntityTypeGeneratorTest.cs index 72ad7fb1783..c3a393e1a6f 100644 --- a/test/EFCore.Design.Tests/Scaffolding/Internal/CSharpEntityTypeGeneratorTest.cs +++ b/test/EFCore.Design.Tests/Scaffolding/Internal/CSharpEntityTypeGeneratorTest.cs @@ -791,9 +791,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) model => { var entitType = model.FindEntityType("TestNamespace.Entity"); - Assert.Equal("propertyA", entitType.GetProperty("A").GetColumnName()); + Assert.Equal("propertyA", entitType.GetProperty("A").GetColumnBaseName()); Assert.Equal("nchar(10)", entitType.GetProperty("B").GetColumnType()); - Assert.Equal("random", entitType.GetProperty("C").GetColumnName()); + Assert.Equal("random", entitType.GetProperty("C").GetColumnBaseName()); Assert.Equal("varchar(200)", entitType.GetProperty("C").GetColumnType()); }); } diff --git a/test/EFCore.Design.Tests/Scaffolding/Internal/RelationalScaffoldingModelFactoryTest.cs b/test/EFCore.Design.Tests/Scaffolding/Internal/RelationalScaffoldingModelFactoryTest.cs index 4f3daae5cd7..383007359bd 100644 --- a/test/EFCore.Design.Tests/Scaffolding/Internal/RelationalScaffoldingModelFactoryTest.cs +++ b/test/EFCore.Design.Tests/Scaffolding/Internal/RelationalScaffoldingModelFactoryTest.cs @@ -210,7 +210,7 @@ public void Loads_column_types() }, col1 => { - Assert.Equal("created", col1.GetColumnName()); + Assert.Equal("created", col1.GetColumnBaseName()); Assert.Equal(ValueGenerated.OnAdd, col1.ValueGenerated); }, col2 => @@ -221,12 +221,12 @@ public void Loads_column_types() }, col3 => { - Assert.Equal("modified", col3.GetColumnName()); + Assert.Equal("modified", col3.GetColumnBaseName()); Assert.Equal(ValueGenerated.OnAddOrUpdate, col3.ValueGenerated); }, col4 => { - Assert.Equal("occupation", col4.GetColumnName()); + Assert.Equal("occupation", col4.GetColumnBaseName()); Assert.Equal(typeof(string), col4.ClrType); Assert.False(col4.IsColumnNullable()); Assert.Null(col4.GetMaxLength()); @@ -495,7 +495,7 @@ public void Primary_key(string[] keyProps, int length) var model = (EntityType)_factory.Create(info, new ModelReverseEngineerOptions()).GetEntityTypes().Single(); Assert.Equal("MyPk", model.FindPrimaryKey().GetName()); - Assert.Equal(keyProps, model.FindPrimaryKey().Properties.Select(p => p.GetColumnName()).ToArray()); + Assert.Equal(keyProps, model.FindPrimaryKey().Properties.Select(p => p.GetColumnBaseName()).ToArray()); } [ConditionalFact] @@ -1272,12 +1272,12 @@ public void Unique_names() s1 => { Assert.Equal("SanItized", s1.Name); - Assert.Equal("San itized", s1.GetColumnName()); + Assert.Equal("San itized", s1.GetColumnBaseName()); }, s2 => { Assert.Equal("SanItized1", s2.Name); - Assert.Equal("San+itized", s2.GetColumnName()); + Assert.Equal("San+itized", s2.GetColumnBaseName()); }); }, ef2 => @@ -1286,7 +1286,7 @@ public void Unique_names() Assert.Equal("EF1", ef2.Name); var id = Assert.Single(ef2.GetProperties()); Assert.Equal("Id", id.Name); - Assert.Equal("Id", id.GetColumnName()); + Assert.Equal("Id", id.GetColumnBaseName()); }); } @@ -1931,7 +1931,7 @@ public void UseDatabaseNames_and_NoPluralize_work_together( new ModelReverseEngineerOptions { UseDatabaseNames = useDatabaseNames, NoPluralize = noPluralize }); var user = Assert.Single(model.GetEntityTypes().Where(e => e.GetTableName() == userTableName)); - var id = Assert.Single(user.GetProperties().Where(p => p.GetColumnName() == "id")); + var id = Assert.Single(user.GetProperties().Where(p => p.GetColumnBaseName() == "id")); var foreignKey = Assert.Single(user.GetReferencingForeignKeys()); if (useDatabaseNames && noPluralize) { diff --git a/test/EFCore.Relational.Tests/Metadata/Conventions/TableSharingConcurrencyTokenConventionTest.cs b/test/EFCore.Relational.Tests/Metadata/Conventions/TableSharingConcurrencyTokenConventionTest.cs index 9e69fd29cc9..007eda631db 100644 --- a/test/EFCore.Relational.Tests/Metadata/Conventions/TableSharingConcurrencyTokenConventionTest.cs +++ b/test/EFCore.Relational.Tests/Metadata/Conventions/TableSharingConcurrencyTokenConventionTest.cs @@ -33,7 +33,7 @@ public virtual void Missing_concurrency_token_property_is_created_on_the_base_ty var concurrencyProperty = animal.FindProperty("_TableSharingConcurrencyTokenConvention_Version"); Assert.True(concurrencyProperty.IsConcurrencyToken); Assert.True(concurrencyProperty.IsShadowProperty()); - Assert.Equal("Version", concurrencyProperty.GetColumnName()); + Assert.Equal("Version", concurrencyProperty.GetColumnBaseName()); Assert.Equal(ValueGenerated.OnAddOrUpdate, concurrencyProperty.ValueGenerated); } @@ -118,7 +118,7 @@ public virtual void Missing_concurrency_token_properties_are_created_on_the_base var concurrencyProperty = animal.FindProperty("_TableSharingConcurrencyTokenConvention_Version"); Assert.True(concurrencyProperty.IsConcurrencyToken); Assert.True(concurrencyProperty.IsShadowProperty()); - Assert.Equal("Version", concurrencyProperty.GetColumnName()); + Assert.Equal("Version", concurrencyProperty.GetColumnBaseName()); Assert.Equal(ValueGenerated.OnUpdate, concurrencyProperty.ValueGenerated); var cat = model.FindEntityType(typeof(Cat)); @@ -128,7 +128,7 @@ public virtual void Missing_concurrency_token_properties_are_created_on_the_base concurrencyProperty = animalHouse.FindProperty("_TableSharingConcurrencyTokenConvention_Version"); Assert.True(concurrencyProperty.IsConcurrencyToken); Assert.True(concurrencyProperty.IsShadowProperty()); - Assert.Equal("Version", concurrencyProperty.GetColumnName()); + Assert.Equal("Version", concurrencyProperty.GetColumnBaseName()); Assert.Equal(ValueGenerated.OnUpdate, concurrencyProperty.ValueGenerated); var theMovie = model.FindEntityType(typeof(TheMovie)); @@ -152,7 +152,7 @@ public virtual void Missing_concurrency_token_property_is_created_on_the_sharing var concurrencyProperty = personEntityType.FindProperty("_TableSharingConcurrencyTokenConvention_Version"); Assert.True(concurrencyProperty.IsConcurrencyToken); Assert.True(concurrencyProperty.IsShadowProperty()); - Assert.Equal("Version", concurrencyProperty.GetColumnName()); + Assert.Equal("Version", concurrencyProperty.GetColumnBaseName()); Assert.Equal(ValueGenerated.OnAddOrUpdate, concurrencyProperty.ValueGenerated); } diff --git a/test/EFCore.Relational.Tests/Metadata/RelationalBuilderExtensionsTest.cs b/test/EFCore.Relational.Tests/Metadata/RelationalBuilderExtensionsTest.cs index c2b25130b01..39d4b0f0a37 100644 --- a/test/EFCore.Relational.Tests/Metadata/RelationalBuilderExtensionsTest.cs +++ b/test/EFCore.Relational.Tests/Metadata/RelationalBuilderExtensionsTest.cs @@ -69,7 +69,7 @@ public void Can_set_column_name() var property = modelBuilder.Model.FindEntityType(typeof(Customer)).FindProperty("Name"); Assert.Equal("Name", property.Name); - Assert.Equal("Eman", property.GetColumnName()); + Assert.Equal("Eman", property.GetColumnBaseName()); } [ConditionalFact] diff --git a/test/EFCore.Relational.Tests/Metadata/RelationalMetadataBuilderExtensionsTest.cs b/test/EFCore.Relational.Tests/Metadata/RelationalMetadataBuilderExtensionsTest.cs index 541da0212a8..b622e10aba9 100644 --- a/test/EFCore.Relational.Tests/Metadata/RelationalMetadataBuilderExtensionsTest.cs +++ b/test/EFCore.Relational.Tests/Metadata/RelationalMetadataBuilderExtensionsTest.cs @@ -89,7 +89,7 @@ public void Can_access_property() Assert.NotNull(propertyBuilder.IsFixedLength(true)); Assert.True(propertyBuilder.Metadata.IsFixedLength()); Assert.NotNull(propertyBuilder.HasColumnName("Splew")); - Assert.Equal("Splew", propertyBuilder.Metadata.GetColumnName()); + Assert.Equal("Splew", propertyBuilder.Metadata.GetColumnBaseName()); Assert.NotNull(propertyBuilder.HasColumnType("int")); Assert.Equal("int", propertyBuilder.Metadata.GetColumnType()); Assert.NotNull(propertyBuilder.HasDefaultValue(1)); @@ -106,7 +106,7 @@ public void Can_access_property() Assert.False(propertyBuilder.Metadata.IsFixedLength()); Assert.NotNull(propertyBuilder.HasColumnName("Splow", fromDataAnnotation: true)); Assert.Null(propertyBuilder.HasColumnName("Splod")); - Assert.Equal("Splow", propertyBuilder.Metadata.GetColumnName()); + Assert.Equal("Splow", propertyBuilder.Metadata.GetColumnBaseName()); Assert.NotNull(propertyBuilder.HasColumnType("varchar", fromDataAnnotation: true)); Assert.Null(propertyBuilder.HasColumnType("int")); Assert.Equal("varchar", propertyBuilder.Metadata.GetColumnType()); diff --git a/test/EFCore.Relational.Tests/Metadata/RelationalMetadataExtensionsTest.cs b/test/EFCore.Relational.Tests/Metadata/RelationalMetadataExtensionsTest.cs index be764228ae1..81f1b0a7c9d 100644 --- a/test/EFCore.Relational.Tests/Metadata/RelationalMetadataExtensionsTest.cs +++ b/test/EFCore.Relational.Tests/Metadata/RelationalMetadataExtensionsTest.cs @@ -64,16 +64,16 @@ public void Can_get_and_set_column_name() .Property(e => e.Name) .Metadata; - Assert.Equal("Name", property.GetColumnName()); + Assert.Equal("Name", property.GetColumnBaseName()); property.SetColumnName("Eman"); Assert.Equal("Name", property.Name); - Assert.Equal("Eman", property.GetColumnName()); + Assert.Equal("Eman", property.GetColumnBaseName()); property.SetColumnName(null); - Assert.Equal("Name", property.GetColumnName()); + Assert.Equal("Name", property.GetColumnBaseName()); } [ConditionalFact] diff --git a/test/EFCore.Relational.Tests/Metadata/RelationalModelTest.cs b/test/EFCore.Relational.Tests/Metadata/RelationalModelTest.cs index 88edc94b8b5..4ad8a5a794a 100644 --- a/test/EFCore.Relational.Tests/Metadata/RelationalModelTest.cs +++ b/test/EFCore.Relational.Tests/Metadata/RelationalModelTest.cs @@ -72,13 +72,13 @@ private static void AssertDefaultMappings(IRelationalModel model) var orderMapping = orderType.GetDefaultMappings().Single(); Assert.True(orderMapping.IncludesDerivedTypes); Assert.Equal( - new[] { nameof(Order.OrderId), nameof(Order.AlternateId), nameof(Order.CustomerId), nameof(Order.OrderDate) }, + new[] { nameof(Order.Id), nameof(Order.AlternateId), nameof(Order.CustomerId), nameof(Order.OrderDate) }, orderMapping.ColumnMappings.Select(m => m.Property.Name)); var ordersTable = orderMapping.Table; Assert.Equal(new[] { nameof(Order) }, ordersTable.EntityTypeMappings.Select(m => m.EntityType.DisplayName())); Assert.Equal( - new[] { nameof(Order.AlternateId), nameof(Order.CustomerId), "OrderDate", nameof(Order.OrderId) }, + new[] { nameof(Order.AlternateId), nameof(Order.CustomerId), nameof(Order.Id), "OrderDate" }, ordersTable.Columns.Select(m => m.Name)); Assert.Equal("Order", ordersTable.Name); Assert.Null(ordersTable.Schema); @@ -139,7 +139,7 @@ private static void AssertViews(IRelationalModel model, Mapping mapping) Assert.Same(orderType.GetViewMappings(), orderType.GetViewOrTableMappings()); Assert.True(orderMapping.IncludesDerivedTypes); Assert.Equal( - new[] { nameof(Order.OrderId), nameof(Order.AlternateId), nameof(Order.CustomerId), nameof(Order.OrderDate) }, + new[] { nameof(Order.Id), nameof(Order.AlternateId), nameof(Order.CustomerId), nameof(Order.OrderDate) }, orderMapping.ColumnMappings.Select(m => m.Property.Name)); var ordersView = orderMapping.View; @@ -159,8 +159,8 @@ private static void AssertViews(IRelationalModel model, Mapping mapping) "Details_BillingAddress_Street", "Details_ShippingAddress_City", "Details_ShippingAddress_Street", - "OrderDate", - nameof(Order.OrderId) + nameof(Order.Id), + "OrderDate" }, ordersView.Columns.Select(m => m.Name)); Assert.Equal("OrderView", ordersView.Name); @@ -249,7 +249,7 @@ private static void AssertTables(IRelationalModel model, Mapping mapping) var orderMapping = orderType.GetTableMappings().Single(); Assert.True(orderMapping.IncludesDerivedTypes); Assert.Equal( - new[] { nameof(Order.OrderId), nameof(Order.AlternateId), nameof(Order.CustomerId), nameof(Order.OrderDate) }, + new[] { nameof(Order.Id), nameof(Order.AlternateId), nameof(Order.CustomerId), nameof(Order.OrderDate) }, orderMapping.ColumnMappings.Select(m => m.Property.Name)); var ordersTable = orderMapping.Table; @@ -263,7 +263,7 @@ private static void AssertTables(IRelationalModel model, Mapping mapping) Assert.Equal( new[] { - nameof(Order.OrderId), + nameof(Order.Id), nameof(Order.AlternateId), nameof(Order.CustomerId), "Details_BillingAddress_City", @@ -298,7 +298,7 @@ private static void AssertTables(IRelationalModel model, Mapping mapping) var orderPkConstraint = orderPk.GetMappedConstraints().Single(); Assert.Equal("PK_Order", orderPkConstraint.Name); - Assert.Equal(nameof(Order.OrderId), orderPkConstraint.Columns.Single().Name); + Assert.Equal(nameof(Order.Id), orderPkConstraint.Columns.Single().Name); Assert.Same(ordersTable, orderPkConstraint.Table); Assert.True(orderPkConstraint.GetIsPrimaryKey()); Assert.Same(orderPkConstraint, ordersTable.UniqueConstraints.Last()); @@ -388,6 +388,12 @@ private static void AssertTables(IRelationalModel model, Mapping mapping) var orderDetailsPk = orderDetailsType.FindPrimaryKey(); Assert.Same(orderPkConstraint, orderDetailsPk.GetMappedConstraints().Single()); + var orderDetailsPkProperty = orderDetailsPk.Properties.Single(); +#pragma warning disable CS0618 // Type or member is obsolete + Assert.Equal("Id", orderDetailsPkProperty.GetColumnName()); +#pragma warning restore CS0618 // Type or member is obsolete + Assert.Equal("OrderId", orderDetailsPkProperty.GetColumnBaseName()); + var billingAddressOwnership = orderDetailsType.FindNavigation(nameof(OrderDetails.BillingAddress)).ForeignKey; var billingAddressType = billingAddressOwnership.DeclaringEntityType; @@ -395,7 +401,7 @@ private static void AssertTables(IRelationalModel model, Mapping mapping) var shippingAddressType = shippingAddressOwnership.DeclaringEntityType; Assert.Equal( - new[] { billingAddressType.FindPrimaryKey(), shippingAddressType.FindPrimaryKey(), orderPk, orderDetailsPk }, + new[] { orderPk, billingAddressType.FindPrimaryKey(), shippingAddressType.FindPrimaryKey(), orderDetailsPk }, orderPkConstraint.MappedKeys); var orderDetailsDate = orderDetailsType.FindProperty(nameof(OrderDetails.OrderDate)); @@ -710,7 +716,7 @@ public void Can_use_relational_model_with_SQL_queries() Assert.True(orderMapping.IncludesDerivedTypes); Assert.Equal( - new[] { nameof(Order.AlternateId), nameof(Order.CustomerId), nameof(Order.OrderDate), nameof(Order.OrderId) }, + new[] { nameof(Order.AlternateId), nameof(Order.CustomerId), nameof(Order.Id), nameof(Order.OrderDate) }, orderMapping.ColumnMappings.Select(m => m.Property.Name)); var ordersQuery = orderMapping.SqlQuery; @@ -718,7 +724,7 @@ public void Can_use_relational_model_with_SQL_queries() new[] { orderType }, ordersQuery.EntityTypeMappings.Select(m => m.EntityType)); Assert.Equal( - new[] { nameof(Order.CustomerId), nameof(Order.OrderDate), nameof(Order.OrderId), "SomeName" }, + new[] { nameof(Order.CustomerId), nameof(Order.Id), nameof(Order.OrderDate), "SomeName" }, ordersQuery.Columns.Select(m => m.Name)); Assert.Equal("Microsoft.EntityFrameworkCore.Metadata.RelationalModelTest+Order.MappedSqlQuery", ordersQuery.Name); Assert.Null(ordersQuery.Schema); @@ -791,7 +797,7 @@ public void Can_use_relational_model_with_functions() Assert.True(orderMapping.IncludesDerivedTypes); Assert.Equal( - new[] { nameof(Order.AlternateId), nameof(Order.CustomerId), nameof(Order.OrderDate), nameof(Order.OrderId) }, + new[] { nameof(Order.AlternateId), nameof(Order.CustomerId), nameof(Order.Id), nameof(Order.OrderDate) }, orderMapping.ColumnMappings.Select(m => m.Property.Name)); var ordersFunction = orderMapping.StoreFunction; @@ -800,7 +806,7 @@ public void Can_use_relational_model_with_functions() new[] { orderType }, ordersFunction.EntityTypeMappings.Select(m => m.EntityType)); Assert.Equal( - new[] { nameof(Order.CustomerId), nameof(Order.OrderDate), nameof(Order.OrderId), "SomeName" }, + new[] { nameof(Order.CustomerId), nameof(Order.Id), nameof(Order.OrderDate), "SomeName" }, ordersFunction.Columns.Select(m => m.Name)); Assert.Equal("GetOrders", ordersFunction.Name); Assert.Null(ordersFunction.Schema); @@ -879,7 +885,7 @@ private class SpecialCustomer : Customer private class Order { - public int OrderId { get; set; } + public int Id { get; set; } public Guid AlternateId { get; set; } public DateTime OrderDate { get; set; } diff --git a/test/EFCore.Relational.Tests/Metadata/RelationalPropertyAttributeConventionTest.cs b/test/EFCore.Relational.Tests/Metadata/RelationalPropertyAttributeConventionTest.cs index e015d9f7b1b..53817a51bfc 100644 --- a/test/EFCore.Relational.Tests/Metadata/RelationalPropertyAttributeConventionTest.cs +++ b/test/EFCore.Relational.Tests/Metadata/RelationalPropertyAttributeConventionTest.cs @@ -23,7 +23,7 @@ public void ColumnAttribute_sets_column_name_and_type_with_conventional_builder( var entityBuilder = modelBuilder.Entity(); - Assert.Equal("Post Name", entityBuilder.Property(e => e.Name).Metadata.GetColumnName()); + Assert.Equal("Post Name", entityBuilder.Property(e => e.Name).Metadata.GetColumnBaseName()); Assert.Equal("DECIMAL", entityBuilder.Property(e => e.Name).Metadata.GetColumnType()); } @@ -44,7 +44,7 @@ public void ColumnAttribute_on_field_sets_column_name_and_type_with_conventional var entityBuilder = modelBuilder.Entity(); - Assert.Equal("Post Name", entityBuilder.Property(nameof(F.Name)).Metadata.GetColumnName()); + Assert.Equal("Post Name", entityBuilder.Property(nameof(F.Name)).Metadata.GetColumnBaseName()); Assert.Equal("DECIMAL", entityBuilder.Property(nameof(F.Name)).Metadata.GetColumnType()); } @@ -71,7 +71,7 @@ public void ColumnAttribute_overrides_configuration_from_convention_source() RunConvention(propertyBuilder); - Assert.Equal("Post Name", propertyBuilder.Metadata.GetColumnName()); + Assert.Equal("Post Name", propertyBuilder.Metadata.GetColumnBaseName()); Assert.Equal("DECIMAL", propertyBuilder.Metadata.GetColumnType()); Assert.Equal("Test column comment", propertyBuilder.Metadata.GetComment()); } @@ -103,7 +103,7 @@ public void ColumnAttribute_does_not_override_configuration_from_explicit_source RunConvention(propertyBuilder); - Assert.Equal("ExplicitName", propertyBuilder.Metadata.GetColumnName()); + Assert.Equal("ExplicitName", propertyBuilder.Metadata.GetColumnBaseName()); Assert.Equal("BYTE", propertyBuilder.Metadata.GetColumnType()); Assert.Equal("ExplicitComment", propertyBuilder.Metadata.GetComment()); } diff --git a/test/EFCore.SqlServer.FunctionalTests/DataAnnotationSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/DataAnnotationSqlServerTest.cs index e6ea9bc1357..432c8f3b23d 100644 --- a/test/EFCore.SqlServer.FunctionalTests/DataAnnotationSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/DataAnnotationSqlServerTest.cs @@ -52,7 +52,7 @@ public override ModelBuilder Non_public_annotations_are_enabled() var modelBuilder = base.Non_public_annotations_are_enabled(); var property = GetProperty(modelBuilder, "PersonFirstName"); - Assert.Equal("dsdsd", property.GetColumnName()); + Assert.Equal("dsdsd", property.GetColumnBaseName()); Assert.Equal("nvarchar(128)", property.GetColumnType()); return modelBuilder; @@ -63,7 +63,7 @@ public override ModelBuilder Field_annotations_are_enabled() var modelBuilder = base.Field_annotations_are_enabled(); var property = GetProperty(modelBuilder, "_personFirstName"); - Assert.Equal("dsdsd", property.GetColumnName()); + Assert.Equal("dsdsd", property.GetColumnBaseName()); Assert.Equal("nvarchar(128)", property.GetColumnType()); return modelBuilder; @@ -74,7 +74,7 @@ public override ModelBuilder Key_and_column_work_together() var modelBuilder = base.Key_and_column_work_together(); var relational = GetProperty(modelBuilder, "PersonFirstName"); - Assert.Equal("dsdsd", relational.GetColumnName()); + Assert.Equal("dsdsd", relational.GetColumnBaseName()); Assert.Equal("nvarchar(128)", relational.GetColumnType()); return modelBuilder; @@ -133,7 +133,7 @@ public virtual void ColumnAttribute_configures_the_property_correctly() Assert.Equal( "Unique_No", - modelBuilder.Model.FindEntityType(typeof(One)).FindProperty(nameof(One.UniqueNo)).GetColumnName()); + modelBuilder.Model.FindEntityType(typeof(One)).FindProperty(nameof(One.UniqueNo)).GetColumnBaseName()); } public override ModelBuilder DatabaseGeneratedOption_Identity_does_not_throw_on_noninteger_properties() diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/IncompleteMappingInheritanceQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/IncompleteMappingInheritanceQuerySqlServerTest.cs index 26c8ff2730d..498a9c46c0f 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/IncompleteMappingInheritanceQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/IncompleteMappingInheritanceQuerySqlServerTest.cs @@ -31,15 +31,15 @@ public virtual void Common_property_shares_column() var cokeType = context.Model.FindEntityType(typeof(Coke)); var teaType = context.Model.FindEntityType(typeof(Tea)); - Assert.Equal("SugarGrams", cokeType.FindProperty("SugarGrams").GetColumnName()); - Assert.Equal("CaffeineGrams", cokeType.FindProperty("CaffeineGrams").GetColumnName()); - Assert.Equal("CokeCO2", cokeType.FindProperty("Carbonation").GetColumnName()); + Assert.Equal("SugarGrams", cokeType.FindProperty("SugarGrams").GetColumnBaseName()); + Assert.Equal("CaffeineGrams", cokeType.FindProperty("CaffeineGrams").GetColumnBaseName()); + Assert.Equal("CokeCO2", cokeType.FindProperty("Carbonation").GetColumnBaseName()); - Assert.Equal("SugarGrams", liltType.FindProperty("SugarGrams").GetColumnName()); - Assert.Equal("LiltCO2", liltType.FindProperty("Carbonation").GetColumnName()); + Assert.Equal("SugarGrams", liltType.FindProperty("SugarGrams").GetColumnBaseName()); + Assert.Equal("LiltCO2", liltType.FindProperty("Carbonation").GetColumnBaseName()); - Assert.Equal("CaffeineGrams", teaType.FindProperty("CaffeineGrams").GetColumnName()); - Assert.Equal("HasMilk", teaType.FindProperty("HasMilk").GetColumnName()); + Assert.Equal("CaffeineGrams", teaType.FindProperty("CaffeineGrams").GetColumnBaseName()); + Assert.Equal("HasMilk", teaType.FindProperty("HasMilk").GetColumnBaseName()); } public override async Task Can_query_when_shared_column(bool async) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/InheritanceQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/InheritanceQuerySqlServerTest.cs index 1d8185d60e6..a66644b3af2 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/InheritanceQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/InheritanceQuerySqlServerTest.cs @@ -28,15 +28,15 @@ public virtual void Common_property_shares_column() var cokeType = context.Model.FindEntityType(typeof(Coke)); var teaType = context.Model.FindEntityType(typeof(Tea)); - Assert.Equal("SugarGrams", cokeType.FindProperty("SugarGrams").GetColumnName()); - Assert.Equal("CaffeineGrams", cokeType.FindProperty("CaffeineGrams").GetColumnName()); - Assert.Equal("CokeCO2", cokeType.FindProperty("Carbonation").GetColumnName()); + Assert.Equal("SugarGrams", cokeType.FindProperty("SugarGrams").GetColumnBaseName()); + Assert.Equal("CaffeineGrams", cokeType.FindProperty("CaffeineGrams").GetColumnBaseName()); + Assert.Equal("CokeCO2", cokeType.FindProperty("Carbonation").GetColumnBaseName()); - Assert.Equal("SugarGrams", liltType.FindProperty("SugarGrams").GetColumnName()); - Assert.Equal("LiltCO2", liltType.FindProperty("Carbonation").GetColumnName()); + Assert.Equal("SugarGrams", liltType.FindProperty("SugarGrams").GetColumnBaseName()); + Assert.Equal("LiltCO2", liltType.FindProperty("Carbonation").GetColumnBaseName()); - Assert.Equal("CaffeineGrams", teaType.FindProperty("CaffeineGrams").GetColumnName()); - Assert.Equal("HasMilk", teaType.FindProperty("HasMilk").GetColumnName()); + Assert.Equal("CaffeineGrams", teaType.FindProperty("CaffeineGrams").GetColumnBaseName()); + Assert.Equal("HasMilk", teaType.FindProperty("HasMilk").GetColumnBaseName()); } public override async Task Can_query_when_shared_column(bool async) diff --git a/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTest.cs index f8044d88651..2d616562738 100644 --- a/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTest.cs @@ -118,10 +118,10 @@ public override void Identifiers_are_generated_correctly() entityType2.GetKeys().Single().GetName()); Assert.Equal( "ExtraPropertyWithAnExtremelyLongAndOverlyConvolutedNameThatIsUsedToVerifyThatTheStoreIdentifierGenerationLengthLimitIsWorkingCo~", - entityType2.GetProperties().ElementAt(1).GetColumnName()); + entityType2.GetProperties().ElementAt(1).GetColumnBaseName()); Assert.Equal( "ExtraPropertyWithAnExtremelyLongAndOverlyConvolutedNameThatIsUsedToVerifyThatTheStoreIdentifierGenerationLengthLimitIsWorkingC~1", - entityType2.GetProperties().ElementAt(2).GetColumnName()); + entityType2.GetProperties().ElementAt(2).GetColumnBaseName()); Assert.Equal( "IX_LoginEntityTypeWithAnExtremelyLongAndOverlyConvolutedNameThatIsUsedToVerifyThatTheStoreIdentifierGenerationLengthLimitIsWor~1", entityType2.GetIndexes().Single().GetDatabaseName()); diff --git a/test/EFCore.SqlServer.Tests/Metadata/SqlServerMetadataExtensionsTest.cs b/test/EFCore.SqlServer.Tests/Metadata/SqlServerMetadataExtensionsTest.cs index be296162d87..4620565dcdb 100644 --- a/test/EFCore.SqlServer.Tests/Metadata/SqlServerMetadataExtensionsTest.cs +++ b/test/EFCore.SqlServer.Tests/Metadata/SqlServerMetadataExtensionsTest.cs @@ -102,23 +102,23 @@ public void Can_get_and_set_column_name() .Property(e => e.Name) .Metadata; - Assert.Equal("Name", property.GetColumnName()); + Assert.Equal("Name", property.GetColumnBaseName()); Assert.Null(((IConventionProperty)property).GetColumnNameConfigurationSource()); ((IConventionProperty)property).SetColumnName("Eman", fromDataAnnotation: true); - Assert.Equal("Eman", property.GetColumnName()); + Assert.Equal("Eman", property.GetColumnBaseName()); Assert.Equal(ConfigurationSource.DataAnnotation, ((IConventionProperty)property).GetColumnNameConfigurationSource()); property.SetColumnName("MyNameIs"); Assert.Equal("Name", property.Name); - Assert.Equal("MyNameIs", property.GetColumnName()); + Assert.Equal("MyNameIs", property.GetColumnBaseName()); Assert.Equal(ConfigurationSource.Explicit, ((IConventionProperty)property).GetColumnNameConfigurationSource()); property.SetColumnName(null); - Assert.Equal("Name", property.GetColumnName()); + Assert.Equal("Name", property.GetColumnBaseName()); Assert.Null(((IConventionProperty)property).GetColumnNameConfigurationSource()); } diff --git a/test/EFCore.SqlServer.Tests/ModelBuilding/SqlServerModelBuilderGenericTest.cs b/test/EFCore.SqlServer.Tests/ModelBuilding/SqlServerModelBuilderGenericTest.cs index ca414e118ee..e8232508eb8 100644 --- a/test/EFCore.SqlServer.Tests/ModelBuilding/SqlServerModelBuilderGenericTest.cs +++ b/test/EFCore.SqlServer.Tests/ModelBuilding/SqlServerModelBuilderGenericTest.cs @@ -93,10 +93,10 @@ public void Can_use_shadow_FK_that_collides_with_convention_shadow_FK_on_other_d var property1 = modelBuilder.Model.FindEntityType(typeof(DisjointChildSubclass1)).FindProperty("ParentId"); Assert.True(property1.IsForeignKey()); - Assert.Equal("ParentId", property1.GetColumnName()); + Assert.Equal("ParentId", property1.GetColumnBaseName()); var property2 = modelBuilder.Model.FindEntityType(typeof(DisjointChildSubclass2)).FindProperty("ParentId"); Assert.True(property2.IsForeignKey()); - Assert.Equal("DisjointChildSubclass2_ParentId", property2.GetColumnName()); + Assert.Equal("DisjointChildSubclass2_ParentId", property2.GetColumnBaseName()); } [ConditionalFact] @@ -111,9 +111,9 @@ public void Inherited_clr_properties_are_mapped_to_the_same_column() modelBuilder.FinalizeModel(); var property1 = modelBuilder.Model.FindEntityType(typeof(DisjointChildSubclass1)).FindProperty(nameof(Child.Name)); - Assert.Equal(nameof(Child.Name), property1.GetColumnName()); + Assert.Equal(nameof(Child.Name), property1.GetColumnBaseName()); var property2 = modelBuilder.Model.FindEntityType(typeof(DisjointChildSubclass2)).FindProperty(nameof(Child.Name)); - Assert.Equal(nameof(Child.Name), property2.GetColumnName()); + Assert.Equal(nameof(Child.Name), property2.GetColumnBaseName()); } [ConditionalFact] //Issue#10659 @@ -526,7 +526,7 @@ public virtual void Owned_type_collections_can_be_mapped_to_different_tables() Assert.Single(owned.GetIndexes()); Assert.Equal( new[] { nameof(Order.OrderId), nameof(Order.AnotherCustomerId), nameof(Order.CustomerId) }, - owned.GetProperties().Select(p => p.GetColumnName())); + owned.GetProperties().Select(p => p.GetColumnBaseName())); Assert.Equal(nameof(Order), owned.GetTableName()); Assert.Null(owned.GetSchema()); Assert.True(owned.IsMemoryOptimized()); diff --git a/test/EFCore.Sqlite.FunctionalTests/DataAnnotationSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/DataAnnotationSqliteTest.cs index 686d6ebba52..8aa44672ed6 100644 --- a/test/EFCore.Sqlite.FunctionalTests/DataAnnotationSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/DataAnnotationSqliteTest.cs @@ -27,7 +27,7 @@ public override ModelBuilder Non_public_annotations_are_enabled() var modelBuilder = base.Non_public_annotations_are_enabled(); var relational = GetProperty(modelBuilder, "PersonFirstName"); - Assert.Equal("dsdsd", relational.GetColumnName()); + Assert.Equal("dsdsd", relational.GetColumnBaseName()); Assert.Equal("nvarchar(128)", relational.GetColumnType()); return modelBuilder; @@ -38,7 +38,7 @@ public override ModelBuilder Field_annotations_are_enabled() var modelBuilder = base.Field_annotations_are_enabled(); var relational = GetProperty(modelBuilder, "_personFirstName"); - Assert.Equal("dsdsd", relational.GetColumnName()); + Assert.Equal("dsdsd", relational.GetColumnBaseName()); Assert.Equal("nvarchar(128)", relational.GetColumnType()); return modelBuilder; @@ -49,7 +49,7 @@ public override ModelBuilder Key_and_column_work_together() var modelBuilder = base.Key_and_column_work_together(); var relational = GetProperty(modelBuilder, "PersonFirstName"); - Assert.Equal("dsdsd", relational.GetColumnName()); + Assert.Equal("dsdsd", relational.GetColumnBaseName()); Assert.Equal("nvarchar(128)", relational.GetColumnType()); return modelBuilder; From 46a1958fb6303c64cc9ebd58584f594b4acef6c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Sep 2020 01:03:46 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/runtime build 20200922.5 (#22674) [release/5.0-rc2] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++++----------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6debe9f8917..832946d0154 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,53 +1,53 @@ - + https://github.com/dotnet/runtime - 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b + 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc - + https://github.com/dotnet/runtime - 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b + 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc - + https://github.com/dotnet/runtime - 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b + 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc - + https://github.com/dotnet/runtime - 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b + 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc - + https://github.com/dotnet/runtime - 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b + 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc - + https://github.com/dotnet/runtime - 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b + 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc - + https://github.com/dotnet/runtime - 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b + 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc - + https://github.com/dotnet/runtime - 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b + 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc - + https://github.com/dotnet/runtime - 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b + 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc - + https://github.com/dotnet/runtime - 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b + 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc - + https://github.com/dotnet/runtime - 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b + 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc - + https://github.com/dotnet/runtime - 27fd1ca99f4322dcc89e2b91f72c4f1b9ee2994b + 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 739d21e0871..bb380ecad09 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,18 +15,18 @@ False - 5.0.0-rc.2.20472.3 - 5.0.0-rc.2.20472.3 - 5.0.0-rc.2.20472.3 - 5.0.0-rc.2.20472.3 - 5.0.0-rc.2.20472.3 - 5.0.0-rc.2.20472.3 - 5.0.0-rc.2.20472.3 - 5.0.0-rc.2.20472.3 - 5.0.0-rc.2.20472.3 - 5.0.0-rc.2.20472.3 - 5.0.0-rc.2.20472.3 - 5.0.0-rc.2.20472.3 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.5 3.7.0 From 7253dbce5e004c5fdbbc10b64dcffc0e687570fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Sep 2020 05:58:46 +0000 Subject: [PATCH 4/4] Update dependencies from https://github.com/dotnet/runtime build 20200922.7 (#22677) [release/5.0-rc2] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++++----------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 832946d0154..a82907525dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,53 +1,53 @@ - + https://github.com/dotnet/runtime - 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc + 3146953047a3f88987d7fb36e3aa4bcd81c73f6c - + https://github.com/dotnet/runtime - 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc + 3146953047a3f88987d7fb36e3aa4bcd81c73f6c - + https://github.com/dotnet/runtime - 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc + 3146953047a3f88987d7fb36e3aa4bcd81c73f6c - + https://github.com/dotnet/runtime - 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc + 3146953047a3f88987d7fb36e3aa4bcd81c73f6c - + https://github.com/dotnet/runtime - 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc + 3146953047a3f88987d7fb36e3aa4bcd81c73f6c - + https://github.com/dotnet/runtime - 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc + 3146953047a3f88987d7fb36e3aa4bcd81c73f6c - + https://github.com/dotnet/runtime - 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc + 3146953047a3f88987d7fb36e3aa4bcd81c73f6c - + https://github.com/dotnet/runtime - 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc + 3146953047a3f88987d7fb36e3aa4bcd81c73f6c - + https://github.com/dotnet/runtime - 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc + 3146953047a3f88987d7fb36e3aa4bcd81c73f6c - + https://github.com/dotnet/runtime - 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc + 3146953047a3f88987d7fb36e3aa4bcd81c73f6c - + https://github.com/dotnet/runtime - 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc + 3146953047a3f88987d7fb36e3aa4bcd81c73f6c - + https://github.com/dotnet/runtime - 57fcdc785fe74dd3cf2ef5a72625cf92a06ca2fc + 3146953047a3f88987d7fb36e3aa4bcd81c73f6c https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index bb380ecad09..9a30970b5fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,18 +15,18 @@ False - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 - 5.0.0-rc.2.20472.5 + 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.7 + 5.0.0-rc.2.20472.7 3.7.0