Fix NTS scaffolding code generation (#1997)

Following dotnet/efcore#26160 (cherry picked from commit 126a6b6)
npgsql · Dec 22, 2021 · 854d243 · 854d243
1 parent 5675010
commit 854d243
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 1 deletion.
diff --git a/src/EFCore.PG.NTS/Scaffolding/Internal/NpgsqlNetTopologySuiteCodeGeneratorPlugin.cs b/src/EFCore.PG.NTS/Scaffolding/Internal/NpgsqlNetTopologySuiteCodeGeneratorPlugin.cs
@@ -3,6 +3,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
 using Microsoft.EntityFrameworkCore.Scaffolding;
+using NetTopologySuite.Geometries;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure;
 
 namespace Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite.Scaffolding.Internal
@@ -12,7 +13,11 @@ public class NpgsqlNetTopologySuiteCodeGeneratorPlugin : ProviderCodeGeneratorPl
         private static readonly MethodInfo _useNetTopologySuiteMethodInfo
             = typeof(NpgsqlNetTopologySuiteDbContextOptionsBuilderExtensions).GetRequiredRuntimeMethod(
                 nameof(NpgsqlNetTopologySuiteDbContextOptionsBuilderExtensions.UseNetTopologySuite),
-                typeof(NpgsqlDbContextOptionsBuilder));
+                typeof(NpgsqlDbContextOptionsBuilder),
+                typeof(CoordinateSequenceFactory),
+                typeof(PrecisionModel),
+                typeof(Ordinates),
+                typeof(bool));
 
         public override MethodCallCodeFragment GenerateProviderOptions()
             => new(_useNetTopologySuiteMethodInfo);

diff --git a/test/EFCore.PG.Tests/Scaffolding/NpgsqlCodeGeneratorTest.cs b/test/EFCore.PG.Tests/Scaffolding/NpgsqlCodeGeneratorTest.cs
@@ -5,6 +5,8 @@
 using Microsoft.EntityFrameworkCore.Design;
 using Microsoft.EntityFrameworkCore.Scaffolding;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure;
+using Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite.Scaffolding.Internal;
+using Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime.Scaffolding.Internal;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Scaffolding.Internal;
 using Xunit;
 
@@ -53,6 +55,52 @@ public virtual void Use_provider_method_is_generated_correctly_with_options()
             Assert.Null(result.ChainedCall);
         }
 
+        [ConditionalFact]
+        public virtual void Use_provider_method_is_generated_correctly_with_NetTopologySuite()
+        {
+            var codeGenerator = new NpgsqlCodeGenerator(
+                new ProviderCodeGeneratorDependencies(
+                    new[] { new NpgsqlNetTopologySuiteCodeGeneratorPlugin() }));
+
+            var result = ((IProviderConfigurationCodeGenerator)codeGenerator).GenerateUseProvider("Data Source=Test");
+
+            Assert.Equal("UseNpgsql", result.Method);
+            Assert.Collection(
+                result.Arguments,
+                a => Assert.Equal("Data Source=Test", a),
+                a =>
+                {
+                    var nestedClosure = Assert.IsType<NestedClosureCodeFragment>(a);
+
+                    Assert.Equal("x", nestedClosure.Parameter);
+                    Assert.Equal("UseNetTopologySuite", nestedClosure.MethodCalls[0].Method);
+                });
+            Assert.Null(result.ChainedCall);
+        }
+
+        [ConditionalFact]
+        public virtual void Use_provider_method_is_generated_correctly_with_NodaTime()
+        {
+            var codeGenerator = new NpgsqlCodeGenerator(
+                new ProviderCodeGeneratorDependencies(
+                    new[] { new NpgsqlNodaTimeCodeGeneratorPlugin() }));
+
+            var result = ((IProviderConfigurationCodeGenerator)codeGenerator).GenerateUseProvider("Data Source=Test");
+
+            Assert.Equal("UseNpgsql", result.Method);
+            Assert.Collection(
+                result.Arguments,
+                a => Assert.Equal("Data Source=Test", a),
+                a =>
+                {
+                    var nestedClosure = Assert.IsType<NestedClosureCodeFragment>(a);
+
+                    Assert.Equal("x", nestedClosure.Parameter);
+                    Assert.Equal("UseNodaTime", nestedClosure.MethodCalls[0].Method);
+                });
+            Assert.Null(result.ChainedCall);
+        }
+
         private static readonly MethodInfo _setProviderOptionMethodInfo
             = typeof(NpgsqlCodeGeneratorTest).GetRuntimeMethod(nameof(SetProviderOption), new[] { typeof(DbContextOptionsBuilder) });