Merge pull request #20 from TAGC/multiple-providers-bug

Support instantiating DbContexts with multiple providers in same execution context

Author: pergerch

src/SpatialFocus.EntityFrameworkCore.Extensions/EnumLookupExtension.cs

@@ -17,8 +17,6 @@ namespace SpatialFocus.EntityFrameworkCore.Extensions
 
 	public static class EnumLookupExtension
 	{
-		private static List<Type> ConcreteTypeSeededList { get; set; } = new List<Type>();
-
 		public static void ConfigureEnumLookup(this ModelBuilder modelBuilder, EnumLookupOptions enumOptions)
 		{
 			foreach (IMutableProperty property in modelBuilder.Model.GetEntityTypes().SelectMany(x => x.GetProperties()).ToList())
@@ -88,6 +86,7 @@ private static void ConfigureEnumLookupForProperty(ModelBuilder modelBuilder, En
 			bool usesDescription = enumValueDescriptions.Values.Any(x => x != null);
 
 			Type enumLookupEntityType = GetEnumLookupEntityType(enumOptions, usesDescription, enumType);
+			bool shouldSkipEnumLookupTableConfiguration = modelBuilder.Model.FindEntityType(enumLookupEntityType) != null;
 
 			configureEntityType(enumLookupEntityType);
 
@@ -98,13 +97,11 @@ private static void ConfigureEnumLookupForProperty(ModelBuilder modelBuilder, En
 				configureEntityTypeConversion(valueConverter);
 			}
 
-			if (ConcreteTypeSeededList.Contains(enumLookupEntityType))
+			if (shouldSkipEnumLookupTableConfiguration)
 			{
 				return;
 			}
 
-			ConcreteTypeSeededList.Add(enumLookupEntityType);
-
 			EntityTypeBuilder enumLookupBuilder = modelBuilder.Entity(enumLookupEntityType);
 			ConfigureEnumLookupTable(enumLookupBuilder, enumOptions, enumType);
 

src/SpatialFocus.EntityFrameworkCore.Extensions/SpatialFocus.EntityFrameworkCore.Extensions.csproj

@@ -5,7 +5,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<Version>2.1.2</Version>
+		<Version>2.1.3</Version>
 		<PackageId>SpatialFocus.EntityFrameworkCore.Extensions</PackageId>
 		<Title>Spatial Focus EntityFrameworkCore Extensions</Title>
 		<Description>A set of useful extensions for EntityFrameworkCore (Enum Lookup Tables, Naming of tables / properties / keys, Pluralize).</Description>

test/SpatialFocus.EntityFrameworkCore.Extensions.Test/NamingOptionsTest.cs

@@ -8,6 +8,7 @@ namespace SpatialFocus.EntityFrameworkCore.Extensions.Test
 	using System;
 	using System.Linq;
 	using Microsoft.EntityFrameworkCore;
+	using Microsoft.EntityFrameworkCore.ChangeTracking;
 	using Microsoft.EntityFrameworkCore.Metadata;
 	using Microsoft.EntityFrameworkCore.Storage;
 	using SpatialFocus.EntityFrameworkCore.Extensions.Test.Entities;
@@ -88,5 +89,32 @@ public void SetNamingScheme()
 			Assert.True(findEntityType.GetForeignKeys().All(x => x.GetConstraintName() == NamingScheme.SnakeCase(x.GetDefaultName())));
 			Assert.True(findEntityType.GetIndexes().All(x => x.GetName() == NamingScheme.SnakeCase(x.GetDefaultName())));
 		}
+
+		[Fact]
+		public void MultipleProviders()
+		{
+			DbContextOptions<ChangeTrackerInConstructorContext> inMemoryOptions = new DbContextOptionsBuilder<ChangeTrackerInConstructorContext>()
+				.UseInMemoryDatabase(Guid.NewGuid().ToString(), new InMemoryDatabaseRoot())
+				.Options;
+
+			ChangeTrackerInConstructorContext _ = new ChangeTrackerInConstructorContext(inMemoryOptions, EnumLookupOptions.Default, null);
+
+			DbContextOptions<ChangeTrackerInConstructorContext> sqliteOptions = new DbContextOptionsBuilder<ChangeTrackerInConstructorContext>()
+				.UseSqlite("Filename=:memory:")
+				.Options;
+
+			ChangeTrackerInConstructorContext context = new ChangeTrackerInConstructorContext(sqliteOptions, EnumLookupOptions.Default, null);
+			context.Database.EnsureCreated();
+			context.Dispose();
+		}
+
+		private class ChangeTrackerInConstructorContext : ProductContext
+		{
+			public ChangeTrackerInConstructorContext(DbContextOptions options, EnumLookupOptions enumLookupOptions, NamingOptions namingOptions)
+				: base(options, enumLookupOptions, namingOptions)
+			{
+				ChangeTracker _ = ChangeTracker;
+			}
+		}
 	}
 }

test/SpatialFocus.EntityFrameworkCore.Extensions.Test/SpatialFocus.EntityFrameworkCore.Extensions.Test.csproj

@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
     <PackageReference Include="xunit" Version="2.4.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />