Merge pull request #130 from efcore/fix-many-service-provders-created-warning

Prevent ManyServiceProvidersCreatedWarning exception (#129)

Author: simon-reynolds

src/EFCore.FSharp/Extensions/ModelBuilderExtensions.fs

@@ -102,17 +102,18 @@ module Extensions =
     let useValueConverterForType (``type``: Type) (converter: ValueConverter) (modelBuilder: ModelBuilder) =
         modelBuilder.UseValueConverterForType(``type``, converter)
 
+    let fSharpTypeOptionsExtensionInstance = FSharpTypeOptionsExtension()
 
     type DbContextOptionsBuilder with
         member this.UseFSharpTypes() =
             let extension =
-                let finded =
+                let found =
                     this.Options.FindExtension<FSharpTypeOptionsExtension>()
 
-                if (box finded) <> null then
-                    finded
+                if notNull found then
+                    found
                 else
-                    FSharpTypeOptionsExtension()
+                    fSharpTypeOptionsExtensionInstance
 
 
             (this :> IDbContextOptionsBuilderInfrastructure)

src/EFCore.FSharp/Translations/Translation.fs

@@ -30,8 +30,9 @@ type ExtensionInfo(extension) =
 
     override _.LogFragment = "using FSharp types"
 
-    override _.ShouldUseSameServiceProvider other = other.IsDatabaseProvider
+    override _.ShouldUseSameServiceProvider other = true
 
+[<AllowNullLiteral>]
 type FSharpTypeOptionsExtension() =
     interface IDbContextOptionsExtension with
         member this.ApplyServices(services) =

tests/EFCore.FSharp.Tests/Translations/OptionTranslationTests.fs

@@ -27,7 +27,7 @@ type MyContext() =
 
     override _.OnConfiguring(options: DbContextOptionsBuilder) : unit =
         options
-            //.EnableServiceProviderCaching(false)
+            .EnableServiceProviderCaching(false)
             .UseInMemoryDatabase("MyContext")
             .UseFSharpTypes()
         |> ignore

tests/EFCore.FSharp.Tests/Translations/SingleCaseUnionTranslationTests.fs

@@ -29,6 +29,7 @@ type MyContext() =
 
     override _.OnConfiguring(options: DbContextOptionsBuilder) : unit =
         options
+            .EnableServiceProviderCaching(false)
             .UseInMemoryDatabase("MyContext")
             .UseFSharpTypes()
         |> ignore