Fixup for #23376

dotnet · Jan 12, 2021 · e94c1cb · e94c1cb
1 parent 4149be5
commit e94c1cb
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 81 deletions.
diff --git a/src/EFCore.Cosmos/Query/Internal/SqlExpressionFactory.cs b/src/EFCore.Cosmos/Query/Internal/SqlExpressionFactory.cs
@@ -142,7 +142,6 @@ when sqlUnaryExpression.IsLogicalNot():
                     throw new InvalidOperationException(
                         CosmosStrings.UnsupportedOperatorForSqlExpression(
                             sqlUnaryExpression.OperatorType, typeof(SqlUnaryExpression).ShortDisplayName()));
-                    ;
             }
 
             return new SqlUnaryExpression(sqlUnaryExpression.OperatorType, operand, resultType, resultTypeMapping);

diff --git a/src/EFCore.Relational/Metadata/Internal/RelationalForeignKeyExtensions.cs b/src/EFCore.Relational/Metadata/Internal/RelationalForeignKeyExtensions.cs
@@ -2,6 +2,7 @@
 // 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.Linq;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Diagnostics;
@@ -44,9 +45,7 @@ public static bool AreCompatible(
             var columnNames = foreignKey.Properties.GetColumnNames(storeObject);
             var duplicateColumnNames = duplicateForeignKey.Properties.GetColumnNames(storeObject);
             if (columnNames is null
-                || duplicateColumnNames is null
-                || principalTable is null
-                || duplicatePrincipalTable is null)
+                || duplicateColumnNames is null)
             {
                 if (shouldThrow)
                 {
@@ -66,11 +65,13 @@ public static bool AreCompatible(
                 return false;
             }
 
-            var principalColumns = foreignKey.PrincipalKey.Properties.GetColumnNames(principalTable.Value);
-            var duplicatePrincipalColumns = duplicateForeignKey.PrincipalKey.Properties.GetColumnNames(principalTable.Value);
-            if (principalTable != duplicatePrincipalTable
-                || principalColumns == null
-                || duplicatePrincipalColumns == null)
+            if (principalTable is null
+                || duplicatePrincipalTable is null
+                || principalTable != duplicatePrincipalTable
+                || !(foreignKey.PrincipalKey.Properties.GetColumnNames(principalTable.Value)
+                    is IReadOnlyList<string> principalColumns)
+                || !(duplicateForeignKey.PrincipalKey.Properties.GetColumnNames(principalTable.Value)
+                    is IReadOnlyList<string> duplicatePrincipalColumns))
             {
                 if (shouldThrow)
                 {
@@ -81,7 +82,9 @@ public static bool AreCompatible(
                             duplicateForeignKey.Properties.Format(),
                             duplicateForeignKey.DeclaringEntityType.DisplayName(),
                             foreignKey.DeclaringEntityType.GetSchemaQualifiedTableName(),
-                            foreignKey.GetConstraintName(storeObject, principalTable.Value),
+                            principalTable.HasValue
+                                ? foreignKey.GetConstraintName(storeObject, principalTable.Value)
+                                : foreignKey.GetDefaultName(),
                             principalType.GetSchemaQualifiedTableName(),
                             duplicatePrincipalType.GetSchemaQualifiedTableName()));
                 }

diff --git a/test/EFCore.Cosmos.FunctionalTests/CosmosApiConsistencyTest.cs b/test/EFCore.Cosmos.FunctionalTests/CosmosApiConsistencyTest.cs
@@ -27,13 +27,6 @@ protected override Assembly TargetAssembly
 
         public class CosmosApiConsistencyFixture : ApiConsistencyFixtureBase
         {
-            public override bool TryGetProviderOptionsDelegate(out Action<DbContextOptionsBuilder> configureOptions)
-            {
-                configureOptions = b => CosmosTestHelpers.Instance.UseProviderOptions(b);
-
-                return true;
-            }
-
             public override HashSet<Type> FluentApiTypes { get; } = new HashSet<Type>
             {
                 typeof(CosmosModelBuilderExtensions),

diff --git a/test/EFCore.Design.Tests/DesignApiConsistencyTest.cs b/test/EFCore.Design.Tests/DesignApiConsistencyTest.cs
@@ -26,13 +26,6 @@ protected override Assembly TargetAssembly
 
         public class DesignApiConsistencyFixture : ApiConsistencyFixtureBase
         {
-            public override bool TryGetProviderOptionsDelegate(out Action<DbContextOptionsBuilder> configureOptions)
-            {
-                configureOptions = b => InMemoryTestHelpers.Instance.UseProviderOptions(b);
-
-                return true;
-            }
-
             public override HashSet<Type> FluentApiTypes { get; } = new HashSet<Type> { typeof(DesignTimeServiceCollectionExtensions) };
         }
     }

diff --git a/test/EFCore.InMemory.FunctionalTests/InMemoryApiConsistencyTest.cs b/test/EFCore.InMemory.FunctionalTests/InMemoryApiConsistencyTest.cs
@@ -26,13 +26,6 @@ protected override Assembly TargetAssembly
 
         public class InMemoryApiConsistencyFixture : ApiConsistencyFixtureBase
         {
-            public override bool TryGetProviderOptionsDelegate(out Action<DbContextOptionsBuilder> configureOptions)
-            {
-                configureOptions = b => InMemoryTestHelpers.Instance.UseProviderOptions(b);
-
-                return true;
-            }
-
             public override HashSet<Type> FluentApiTypes { get; } = new HashSet<Type>
             {
                 typeof(InMemoryServiceCollectionExtensions),

diff --git a/test/EFCore.Proxies.Tests/ProxiesApiConsistencyTest.cs b/test/EFCore.Proxies.Tests/ProxiesApiConsistencyTest.cs
@@ -24,13 +24,6 @@ protected override Assembly TargetAssembly
 
         public class ProxiesApiConsistencyFixture : ApiConsistencyFixtureBase
         {
-            public override bool TryGetProviderOptionsDelegate(out Action<DbContextOptionsBuilder> configureOptions)
-            {
-                configureOptions = b => InMemoryTestHelpers.Instance.UseProviderOptions(b);
-
-                return true;
-            }
-
             public override HashSet<Type> FluentApiTypes { get; } = new HashSet<Type> { typeof(ProxiesServiceCollectionExtensions) };
         }
     }

diff --git a/test/EFCore.Relational.Tests/RelationalApiConsistencyTest.cs b/test/EFCore.Relational.Tests/RelationalApiConsistencyTest.cs
@@ -47,12 +47,6 @@ public void Readonly_relational_metadata_methods_have_expected_name()
 
         public class RelationalApiConsistencyFixture : ApiConsistencyFixtureBase
         {
-            public override bool TryGetProviderOptionsDelegate(out Action<DbContextOptionsBuilder> configureOptions)
-            {
-                configureOptions = null;
-                return false;
-            }
-
             private static Dictionary<Type, (Type Mutable, Type Convention, Type ConventionBuilder)> _metadataTypes
                 => new Dictionary<Type, (Type, Type, Type)>
                 {

diff --git a/test/EFCore.Specification.Tests/ApiConsistencyTestBase.cs b/test/EFCore.Specification.Tests/ApiConsistencyTestBase.cs
@@ -670,7 +670,13 @@ where ns.StartsWith("Microsoft.Entity", StringComparison.Ordinal)
                        && !it.Name.EndsWith("Dependencies", StringComparison.Ordinal)
                        && (it.GetConstructors().Length != 1
                            || it.GetConstructors()[0].GetParameters().Length == 0
-                           || it.GetConstructors()[0].GetParameters()[0].Name != "dependencies")
+                           || it.GetConstructors()[0].GetParameters()[0].Name != "dependencies"
+                           // Check that the parameter has a non-public copy constructor, identifying C# 9 records
+                           || !it.GetConstructors()[0].GetParameters()[0].ParameterType
+                               .GetConstructors(BindingFlags.Instance | BindingFlags.NonPublic)
+                               .Any(c => c.GetParameters() is var parameters
+                                   && parameters.Length == 1
+                                   && parameters[0].Name == "original"))
                    select it)
                 .ToList();
 
@@ -900,8 +906,6 @@ protected ApiConsistencyFixtureBase()
                 Initialize();
             }
 
-            public abstract bool TryGetProviderOptionsDelegate(out Action<DbContextOptionsBuilder> configureOptions);
-
             public virtual HashSet<Type> FluentApiTypes { get; } = new HashSet<Type>();
 
             public virtual Dictionary<Type, Type> GenericFluentApiTypes { get; } = new Dictionary<Type, Type>

diff --git a/test/EFCore.SqlServer.FunctionalTests/SqlServerApiConsistencyTest.cs b/test/EFCore.SqlServer.FunctionalTests/SqlServerApiConsistencyTest.cs
@@ -28,13 +28,6 @@ protected override Assembly TargetAssembly
 
         public class SqlServerApiConsistencyFixture : ApiConsistencyFixtureBase
         {
-            public override bool TryGetProviderOptionsDelegate(out Action<DbContextOptionsBuilder> configureOptions)
-            {
-                configureOptions = b => SqlServerTestHelpers.Instance.UseProviderOptions(b);
-
-                return true;
-            }
-
             public override HashSet<Type> FluentApiTypes { get; } = new HashSet<Type>
             {
                 typeof(SqlServerDbContextOptionsBuilder),

diff --git a/test/EFCore.SqlServer.Tests/SqlServerNTSApiConsistencyTest.cs b/test/EFCore.SqlServer.Tests/SqlServerNTSApiConsistencyTest.cs
@@ -24,13 +24,6 @@ protected override Assembly TargetAssembly
 
         public class SqlServerNTSApiConsistencyFixture : ApiConsistencyFixtureBase
         {
-            public override bool TryGetProviderOptionsDelegate(out Action<DbContextOptionsBuilder> configureOptions)
-            {
-                configureOptions = b => SqlServerTestHelpers.Instance.UseProviderOptions(b);
-
-                return true;
-            }
-
             public override HashSet<Type> FluentApiTypes { get; } = new HashSet<Type>
             {
                 typeof(SqlServerNetTopologySuiteDbContextOptionsBuilderExtensions),

diff --git a/test/EFCore.Sqlite.FunctionalTests/SqliteApiConsistencyTest.cs b/test/EFCore.Sqlite.FunctionalTests/SqliteApiConsistencyTest.cs
@@ -26,13 +26,6 @@ protected override Assembly TargetAssembly
 
         public class SqliteApiConsistencyFixture : ApiConsistencyFixtureBase
         {
-            public override bool TryGetProviderOptionsDelegate(out Action<DbContextOptionsBuilder> configureOptions)
-            {
-                configureOptions = b => SqliteTestHelpers.Instance.UseProviderOptions(b);
-
-                return true;
-            }
-
             public override HashSet<Type> FluentApiTypes { get; } = new HashSet<Type>
             {
                 typeof(SqliteServiceCollectionExtensions),

diff --git a/test/EFCore.Sqlite.Tests/SqliteNTSApiConsistencyTest.cs b/test/EFCore.Sqlite.Tests/SqliteNTSApiConsistencyTest.cs
@@ -24,13 +24,6 @@ protected override Assembly TargetAssembly
 
         public class SqliteNTSApiConsistencyFixture : ApiConsistencyFixtureBase
         {
-            public override bool TryGetProviderOptionsDelegate(out Action<DbContextOptionsBuilder> configureOptions)
-            {
-                configureOptions = b => SqliteTestHelpers.Instance.UseProviderOptions(b);
-
-                return true;
-            }
-
             public override HashSet<Type> FluentApiTypes { get; } = new HashSet<Type>
             {
                 typeof(SqliteNetTopologySuiteDbContextOptionsBuilderExtensions),

diff --git a/test/EFCore.Tests/ApiConsistencyTest.cs b/test/EFCore.Tests/ApiConsistencyTest.cs
@@ -37,12 +37,6 @@ protected override void Initialize()
                 base.Initialize();
             }
 
-            public override bool TryGetProviderOptionsDelegate(out Action<DbContextOptionsBuilder> configureOptions)
-            {
-                configureOptions = null;
-                return false;
-            }
-
             public override HashSet<Type> FluentApiTypes { get; } = new HashSet<Type>
             {
                 typeof(ModelBuilder),