Sync EF Core to 7.0.0-preview.6.22322.4 (npgsql#2410)

roji · Jun 23, 2022 · 266ab16 · 266ab16
1 parent 227a4bc
commit 266ab16
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
- <EFCoreVersion>7.0.0-preview.6.22317.1</EFCoreVersion>
- <MicrosoftExtensionsVersion>7.0.0-preview.6.22312.5</MicrosoftExtensionsVersion>
+ <EFCoreVersion>7.0.0-preview.6.22322.4</EFCoreVersion>
+ <MicrosoftExtensionsVersion>7.0.0-preview.6.22319.5</MicrosoftExtensionsVersion>
  <NpgsqlVersion>7.0.0-preview.5</NpgsqlVersion>
  </PropertyGroup>
 

diff --git a/src/EFCore.PG/Metadata/Internal/NpgsqlAnnotationProvider.cs b/src/EFCore.PG/Metadata/Internal/NpgsqlAnnotationProvider.cs
@@ -43,8 +43,8 @@ public override IEnumerable<IAnnotation> For(IColumn column, bool designTime)
 
  var table = StoreObjectIdentifier.Table(column.Table.Name, column.Table.Schema);
  var valueGeneratedProperty = column.PropertyMappings.Where(
- m =>
- m.TableMapping.IsSharedTablePrincipal && m.TableMapping.EntityType == m.Property.DeclaringEntityType)
+ m => (m.TableMapping.IsSharedTablePrincipal ?? true)
+ && m.TableMapping.EntityType == m.Property.DeclaringEntityType)
  .Select(m => m.Property)
  .FirstOrDefault(
  p => p.GetValueGenerationStrategy(table) switch

diff --git a/...nalTests/BindingInterceptionNpgsqlTest.cs → .../MaterializationInterceptionNpgsqlTest.cs b/...nalTests/BindingInterceptionNpgsqlTest.cs → .../MaterializationInterceptionNpgsqlTest.cs
@@ -6,18 +6,18 @@
 
 namespace Npgsql.EntityFrameworkCore.PostgreSQL;
 
-public class BindingInterceptionNpgsqlTest : BindingInterceptionTestBase,
- IClassFixture<BindingInterceptionNpgsqlTest.BindingInterceptionNpgsqlFixture>
+public class MaterializationInterceptionNpgsqlTest : MaterializationInterceptionTestBase,
+ IClassFixture<MaterializationInterceptionNpgsqlTest.MaterializationInterceptionNpgsqlFixture>
 {
- public BindingInterceptionNpgsqlTest(BindingInterceptionNpgsqlFixture fixture)
+ public MaterializationInterceptionNpgsqlTest(MaterializationInterceptionNpgsqlFixture fixture)
  : base(fixture)
  {
  }
 
- public class BindingInterceptionNpgsqlFixture : SingletonInterceptorsFixtureBase
+ public class MaterializationInterceptionNpgsqlFixture : SingletonInterceptorsFixtureBase
  {
  protected override string StoreName
- => "BindingInterception";
+ => "MaterializationInterception";
 
  protected override ITestStoreFactory TestStoreFactory
  => NpgsqlTestStoreFactory.Instance;

diff --git a/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlTestHelpers.cs b/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlTestHelpers.cs
@@ -11,8 +11,8 @@ protected NpgsqlTestHelpers() {}
  public override IServiceCollection AddProviderServices(IServiceCollection services)
  => services.AddEntityFrameworkNpgsql();
 
- public override void UseProviderOptions(DbContextOptionsBuilder optionsBuilder)
+ public override DbContextOptionsBuilder UseProviderOptions(DbContextOptionsBuilder optionsBuilder)
  => optionsBuilder.UseNpgsql(new NpgsqlConnection("Host=localhost;Database=DummyDatabase"));
 
  public override LoggingDefinitions LoggingDefinitions { get; } = new NpgsqlLoggingDefinitions();
-}
+}