Fix NodaTime Duration mapping (#2285)

Fixes #2287 (cherry picked from commit 7a139e7)
npgsql · Feb 28, 2022 · 52cb60e · 52cb60e
1 parent 23e0e82
commit 52cb60e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/EFCore.PG.NodaTime/Storage/Internal/NpgsqlNodaTimeTypeMappingSourcePlugin.cs b/src/EFCore.PG.NodaTime/Storage/Internal/NpgsqlNodaTimeTypeMappingSourcePlugin.cs
@@ -137,7 +137,7 @@ public NpgsqlNodaTimeTypeMappingSourcePlugin(ISqlGenerationHelper sqlGenerationH
             { "date", new RelationalTypeMapping[] { _date } },
             { "time without time zone", new RelationalTypeMapping[] { _time } },
             { "time with time zone", new RelationalTypeMapping[] { _timetz } },
-            { "interval", new RelationalTypeMapping[] { _periodInterval } },
+            { "interval", new RelationalTypeMapping[] { _periodInterval, _durationInterval } },
 
             { "tsrange", LegacyTimestampBehavior
                 ? new RelationalTypeMapping[] { _legacyTimestampInstantRange, _timestampLocalDateTimeRange }

diff --git a/test/EFCore.PG.NodaTime.FunctionalTests/NpgsqlNodaTimeTypeMappingTest.cs b/test/EFCore.PG.NodaTime.FunctionalTests/NpgsqlNodaTimeTypeMappingTest.cs
@@ -523,6 +523,29 @@ public void GenerateCodeLiteral_returns_OffsetTime_literal()
 
     #region interval
 
+    [Fact]
+    public void Duration_is_properly_mapped()
+    {
+        var mapping = GetMapping(typeof(Duration));
+
+        Assert.Equal("interval", mapping.StoreType);
+        Assert.Same(typeof(Duration), mapping.ClrType);
+
+        Assert.Same(mapping, GetMapping(typeof(Duration), "interval"));
+    }
+
+    [Fact]
+    public void Period_is_properly_mapped()
+    {
+        var mapping = GetMapping(typeof(Period));
+
+        Assert.Equal("interval", mapping.StoreType);
+        Assert.Same(typeof(Period), mapping.ClrType);
+
+        Assert.Same(mapping, GetMapping(typeof(Period)));
+        Assert.Same(mapping, GetMapping(typeof(Period), "interval"));
+    }
+
     [Fact]
     public void GenerateSqlLiteral_returns_Period_literal()
     {