Merge branch 'Sync'

Directory.Packages.props

@@ -1,8 +1,8 @@
   <Project>
   <PropertyGroup>
-    <EFCoreVersion>8.0.0-rc.1.23419.6</EFCoreVersion>
-    <MicrosoftExtensionsVersion>8.0.0-rc.1.23419.4</MicrosoftExtensionsVersion>
-    <NpgsqlVersion>8.0.0-preview.4</NpgsqlVersion>
+    <EFCoreVersion>8.0.0-rc.2.23480.1</EFCoreVersion>
+    <MicrosoftExtensionsVersion>8.0.0-rc.2.23479.6</MicrosoftExtensionsVersion>
+    <NpgsqlVersion>8.0.0-rc.2</NpgsqlVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/EFCore.PG.NodaTime/Query/Internal/NpgsqlNodaTimeMemberTranslatorPlugin.cs

@@ -130,7 +130,7 @@ public NpgsqlNodaTimeMemberTranslator(
             || declaringType == typeof(LocalTime)
             || declaringType == typeof(Period))
         {
-            return TranslateDateTime(instance, member, returnType);
+            return TranslateDateTime(instance, member);
         }
 
         if (declaringType == typeof(ZonedDateTime))
@@ -281,7 +281,7 @@ SqlExpression Upper()
                 _dateTypeMapping);
     }
 
-    private SqlExpression? TranslateDateTime(SqlExpression instance, MemberInfo member, Type returnType)
+    private SqlExpression? TranslateDateTime(SqlExpression instance, MemberInfo member)
         => member.Name switch
         {
             "Year" or "Years" => GetDatePartExpression(instance, "year"),
@@ -378,7 +378,7 @@ private SqlExpression GetDatePartExpressionDouble(
 
             return member == ZonedDateTime_LocalDateTime
                 ? instance
-                : TranslateDateTime(instance, member, returnType);
+                : TranslateDateTime(instance, member);
         }
 
         // date_part, which is used to extract most components, doesn't have an overload for timestamptz, so passing one directly
@@ -388,6 +388,6 @@ private SqlExpression GetDatePartExpressionDouble(
 
         return member == ZonedDateTime_LocalDateTime
             ? instance
-            : TranslateDateTime(instance, member, returnType);
+            : TranslateDateTime(instance, member);
     }
 }

src/EFCore.PG.NodaTime/Storage/Internal/DateIntervalMultirangeMapping.cs

@@ -48,7 +48,7 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public override RelationalTypeMapping Clone(string storeType, int? size)
+    public override RelationalTypeMapping WithStoreTypeAndSize(string storeType, int? size)
         => new DateIntervalMultirangeMapping(Parameters.WithStoreTypeAndSize(storeType, size), _dateIntervalRangeMapping);
 
     /// <summary>

src/EFCore.PG.NodaTime/Storage/Internal/DateIntervalRangeMapping.cs

@@ -55,7 +55,7 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public override RelationalTypeMapping Clone(string storeType, int? size)
+    public override RelationalTypeMapping WithStoreTypeAndSize(string storeType, int? size)
         => new DateIntervalRangeMapping(Parameters.WithStoreTypeAndSize(storeType, size));
 
     /// <summary>

src/EFCore.PG.NodaTime/Storage/Internal/DateMapping.cs

@@ -48,7 +48,7 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public override RelationalTypeMapping Clone(string storeType, int? size)
+    public override RelationalTypeMapping WithStoreTypeAndSize(string storeType, int? size)
         => new DateMapping(Parameters.WithStoreTypeAndSize(storeType, size));
 
     /// <summary>

src/EFCore.PG.NodaTime/Storage/Internal/DurationIntervalMapping.cs

@@ -51,7 +51,7 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public override RelationalTypeMapping Clone(string storeType, int? size)
+    public override RelationalTypeMapping WithStoreTypeAndSize(string storeType, int? size)
         => new DurationIntervalMapping(Parameters.WithStoreTypeAndSize(storeType, size));
 
     /// <summary>

src/EFCore.PG.NodaTime/Storage/Internal/IntervalMultirangeMapping.cs

@@ -48,7 +48,7 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public override RelationalTypeMapping Clone(string storeType, int? size)
+    public override RelationalTypeMapping WithStoreTypeAndSize(string storeType, int? size)
         => new IntervalMultirangeMapping(Parameters.WithStoreTypeAndSize(storeType, size), _intervalRangeMapping);
 
     /// <summary>

src/EFCore.PG.NodaTime/Storage/Internal/IntervalRangeMapping.cs

@@ -58,7 +58,7 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public override RelationalTypeMapping Clone(string storeType, int? size)
+    public override RelationalTypeMapping WithStoreTypeAndSize(string storeType, int? size)
         => new IntervalRangeMapping(Parameters.WithStoreTypeAndSize(storeType, size));
 
     /// <summary>

src/EFCore.PG.NodaTime/Storage/Internal/LegacyTimestampInstantMapping.cs

@@ -50,7 +50,7 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public override RelationalTypeMapping Clone(string storeType, int? size)
+    public override RelationalTypeMapping WithStoreTypeAndSize(string storeType, int? size)
         => new LegacyTimestampInstantMapping(Parameters.WithStoreTypeAndSize(storeType, size));
 
     /// <summary>

src/EFCore.PG.NodaTime/Storage/Internal/NpgsqlNodaTimeTypeMappingSourcePlugin.cs

@@ -77,18 +77,18 @@ static NpgsqlNodaTimeTypeMappingSourcePlugin()
     /// </summary>
     public NpgsqlNodaTimeTypeMappingSourcePlugin(ISqlGenerationHelper sqlGenerationHelper)
     {
-        _timestampLocalDateTimeRange
-            = new NpgsqlRangeTypeMapping("tsrange", typeof(NpgsqlRange<LocalDateTime>), _timestampLocalDateTime, sqlGenerationHelper);
-        _legacyTimestampInstantRange
-            = new NpgsqlRangeTypeMapping("tsrange", typeof(NpgsqlRange<Instant>), _legacyTimestampInstant, sqlGenerationHelper);
-        _timestamptzInstantRange
-            = new NpgsqlRangeTypeMapping("tstzrange", typeof(NpgsqlRange<Instant>), _timestamptzInstant, sqlGenerationHelper);
-        _timestamptzZonedDateTimeRange
-            = new NpgsqlRangeTypeMapping("tstzrange", typeof(NpgsqlRange<ZonedDateTime>), _timestamptzZonedDateTime, sqlGenerationHelper);
-        _timestamptzOffsetDateTimeRange
-            = new NpgsqlRangeTypeMapping("tstzrange", typeof(NpgsqlRange<OffsetDateTime>), _timestamptzOffsetDateTime, sqlGenerationHelper);
-        _dateRange
-            = new NpgsqlRangeTypeMapping("daterange", typeof(NpgsqlRange<LocalDate>), _date, sqlGenerationHelper);
+        _timestampLocalDateTimeRange = NpgsqlRangeTypeMapping.CreatBuiltInRangeMapping(
+            "tsrange", typeof(NpgsqlRange<LocalDateTime>), NpgsqlDbType.TimestampRange, _timestampLocalDateTime);
+        _legacyTimestampInstantRange = NpgsqlRangeTypeMapping.CreatBuiltInRangeMapping(
+            "tsrange", typeof(NpgsqlRange<Instant>), NpgsqlDbType.TimestampRange, _legacyTimestampInstant);
+        _timestamptzInstantRange = NpgsqlRangeTypeMapping.CreatBuiltInRangeMapping(
+            "tstzrange", typeof(NpgsqlRange<Instant>), NpgsqlDbType.TimestampTzRange, _timestamptzInstant);
+        _timestamptzZonedDateTimeRange = NpgsqlRangeTypeMapping.CreatBuiltInRangeMapping(
+            "tstzrange", typeof(NpgsqlRange<ZonedDateTime>), NpgsqlDbType.TimestampTzRange, _timestamptzZonedDateTime);
+        _timestamptzOffsetDateTimeRange = NpgsqlRangeTypeMapping.CreatBuiltInRangeMapping(
+            "tstzrange", typeof(NpgsqlRange<OffsetDateTime>), NpgsqlDbType.TimestampTzRange, _timestamptzOffsetDateTime);
+        _dateRange = NpgsqlRangeTypeMapping.CreatBuiltInRangeMapping(
+            "daterange", typeof(NpgsqlRange<LocalDate>), NpgsqlDbType.DateRange, _date);
 
         var storeTypeMappings = new Dictionary<string, RelationalTypeMapping[]>(StringComparer.OrdinalIgnoreCase)
         {
@@ -192,14 +192,14 @@ public NpgsqlNodaTimeTypeMappingSourcePlugin(ISqlGenerationHelper sqlGenerationH
             {
                 if (clrType is null)
                 {
-                    return mappings[0].Clone(in mappingInfo);
+                    return mappings[0];
                 }
 
                 foreach (var m in mappings)
                 {
                     if (m.ClrType == clrType)
                     {
-                        return m.Clone(in mappingInfo);
+                        return m;
                     }
                 }
 

src/EFCore.PG.NodaTime/Storage/Internal/PeriodIntervalMapping.cs

@@ -56,7 +56,7 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public override RelationalTypeMapping Clone(string storeType, int? size)
+    public override RelationalTypeMapping WithStoreTypeAndSize(string storeType, int? size)
         => new PeriodIntervalMapping(Parameters.WithStoreTypeAndSize(storeType, size));
 
     /// <summary>

src/EFCore.PG.NodaTime/Storage/Internal/TimeMapping.cs

@@ -55,7 +55,7 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public override RelationalTypeMapping Clone(string storeType, int? size)
+    public override RelationalTypeMapping WithStoreTypeAndSize(string storeType, int? size)
         => new TimeMapping(Parameters.WithStoreTypeAndSize(storeType, size));
 
     /// <summary>

src/EFCore.PG.NodaTime/Storage/Internal/TimeTzMapping.cs

@@ -67,7 +67,7 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public override RelationalTypeMapping Clone(string storeType, int? size)
+    public override RelationalTypeMapping WithStoreTypeAndSize(string storeType, int? size)
         => new TimeTzMapping(Parameters.WithStoreTypeAndSize(storeType, size));
 
     /// <summary>

src/EFCore.PG.NodaTime/Storage/Internal/TimestampLocalDateTimeMapping.cs

@@ -54,7 +54,7 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public override RelationalTypeMapping Clone(string storeType, int? size)
+    public override RelationalTypeMapping WithStoreTypeAndSize(string storeType, int? size)
         => new TimestampLocalDateTimeMapping(Parameters.WithStoreTypeAndSize(storeType, size));
 
     /// <summary>

src/EFCore.PG.NodaTime/Storage/Internal/TimestampTzInstantMapping.cs

@@ -44,7 +44,7 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public override RelationalTypeMapping Clone(string storeType, int? size)
+    public override RelationalTypeMapping WithStoreTypeAndSize(string storeType, int? size)
         => new TimestampTzInstantMapping(Parameters.WithStoreTypeAndSize(storeType, size));
 
     /// <summary>

src/EFCore.PG.NodaTime/Storage/Internal/TimestampTzOffsetDateTimeMapping.cs

@@ -54,7 +54,7 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public override RelationalTypeMapping Clone(string storeType, int? size)
+    public override RelationalTypeMapping WithStoreTypeAndSize(string storeType, int? size)
         => new TimestampTzOffsetDateTimeMapping(Parameters.WithStoreTypeAndSize(storeType, size));
 
     /// <summary>

src/EFCore.PG.NodaTime/Storage/Internal/TimestampTzZonedDateTimeMapping.cs

@@ -49,7 +49,7 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public override RelationalTypeMapping Clone(string storeType, int? size)
+    public override RelationalTypeMapping WithStoreTypeAndSize(string storeType, int? size)
         => new TimestampTzZonedDateTimeMapping(Parameters.WithStoreTypeAndSize(storeType, size));
 
     /// <summary>