Sync to 8.0.0-rc.1.23417.21

Fixes #2760 Closes #2855 Closes #2641
npgsql · Aug 29, 2023 · e297ffe · e297ffe
1 parent defe9bc
commit e297ffe
Show file tree

Hide file tree

Showing 136 changed files with 2,843 additions and 1,849 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,7 +1,7 @@
   <Project>
   <PropertyGroup>
-    <EFCoreVersion>8.0.0-preview.7.23375.4</EFCoreVersion>
-    <MicrosoftExtensionsVersion>8.0.0-preview.7.23375.6</MicrosoftExtensionsVersion>
+    <EFCoreVersion>8.0.0-rc.1.23417.21</EFCoreVersion>
+    <MicrosoftExtensionsVersion>8.0.0-rc.1.23402.2</MicrosoftExtensionsVersion>
     <NpgsqlVersion>8.0.0-preview.4</NpgsqlVersion>
   </PropertyGroup>
 

diff --git a/EFCore.PG.sln.DotSettings b/EFCore.PG.sln.DotSettings
@@ -306,6 +306,7 @@ The .NET Foundation licenses this file to you under the MIT license.&#xD;
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Namer/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=navigations/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=niladic/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ordinality/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=plpgsql/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=pluralizer/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Poolable/@EntryIndexedValue">True</s:Boolean>

diff --git a/src/EFCore.PG.NTS/Storage/Internal/NpgsqlGeometryTypeMapping.cs b/src/EFCore.PG.NTS/Storage/Internal/NpgsqlGeometryTypeMapping.cs
@@ -7,32 +7,14 @@
 // ReSharper disable once CheckNamespace
 namespace Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal;
 
-/// <summary>
-///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-///     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 interface INpgsqlGeometryTypeMapping
-{
-    /// <summary>
-    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-    ///     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>
-    RelationalTypeMapping CloneWithElementTypeMapping(RelationalTypeMapping elementTypeMapping);
-}
-
 /// <summary>
 ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
 ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
 ///     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>
 [UsedImplicitly]
-public class NpgsqlGeometryTypeMapping<TGeometry> : RelationalGeometryTypeMapping<TGeometry, TGeometry>,
-    INpgsqlTypeMapping, INpgsqlGeometryTypeMapping
+public class NpgsqlGeometryTypeMapping<TGeometry> : RelationalGeometryTypeMapping<TGeometry, TGeometry>, INpgsqlTypeMapping
 {
     private readonly bool _isGeography;
 
@@ -47,7 +29,7 @@ public virtual NpgsqlDbType NpgsqlDbType
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public NpgsqlGeometryTypeMapping(string storeType, bool isGeography)
-        : base(converter: null, NpgsqlJsonGeometryWktReaderWriter.Instance, storeType)
+        : base(converter: null, storeType, NpgsqlJsonGeometryWktReaderWriter.Instance)
         => _isGeography = isGeography;
 
     /// <summary>
@@ -68,16 +50,6 @@ protected NpgsqlGeometryTypeMapping(RelationalTypeMappingParameters parameters)
     protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters parameters)
         => new NpgsqlGeometryTypeMapping<TGeometry>(parameters);
 
-    /// <summary>
-    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-    ///     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>
-    RelationalTypeMapping INpgsqlGeometryTypeMapping.CloneWithElementTypeMapping(RelationalTypeMapping elementTypeMapping)
-        => new NpgsqlGeometryTypeMapping<TGeometry>(
-            Parameters.WithCoreParameters(Parameters.CoreParameters.WithElementTypeMapping(elementTypeMapping)));
-
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
     ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
@@ -143,5 +115,5 @@ protected override string GenerateNonNullSqlLiteral(object value)
     ///     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>
-    protected override Type WKTReaderType => typeof(WKTReader);
+    protected override Type WktReaderType => typeof(WKTReader);
 }
diff --git a/src/EFCore.PG.NTS/Storage/Internal/NpgsqlJsonGeometryWktReaderWriter.cs b/src/EFCore.PG.NTS/Storage/Internal/NpgsqlJsonGeometryWktReaderWriter.cs
@@ -26,7 +26,7 @@ private NpgsqlJsonGeometryWktReaderWriter()
     }
 
     /// <inheritdoc />
-    public override Geometry FromJsonTyped(ref Utf8JsonReaderManager manager)
+    public override Geometry FromJsonTyped(ref Utf8JsonReaderManager manager, object? existingObject = null)
         => WktReader.Read(manager.CurrentReader.GetString());
 
     /// <inheritdoc />

diff --git a/src/EFCore.PG.NTS/Storage/Internal/NpgsqlNetTopologySuiteTypeMappingSourcePlugin.cs b/src/EFCore.PG.NTS/Storage/Internal/NpgsqlNetTopologySuiteTypeMappingSourcePlugin.cs
@@ -85,22 +85,25 @@ public NpgsqlNetTopologySuiteTypeMappingSourcePlugin(INpgsqlNetTopologySuiteOpti
         var typeMapping = (RelationalTypeMapping)Activator.CreateInstance(
             typeof(NpgsqlGeometryTypeMapping<>).MakeGenericType(clrType), storeTypeName, isGeography)!;
 
-        // TODO: Also restrict the element type mapping based on the user-specified store type?
-        var elementType = clrType == typeof(MultiPoint)
-            ? typeof(Point)
-            : clrType == typeof(MultiLineString)
-                ? typeof(LineString)
-                : clrType == typeof(MultiPolygon)
-                    ? typeof(Polygon)
-                    : clrType == typeof(GeometryCollection)
-                        ? typeof(Geometry)
-                        : null;
-
-        if (elementType is not null)
-        {
-            var elementTypeMapping = FindMapping(new() { ClrType = elementType })!;
-            typeMapping = ((INpgsqlGeometryTypeMapping)typeMapping).CloneWithElementTypeMapping(elementTypeMapping);
-        }
+        // TODO: for geometry collection support (and why the following is commented out), see #2850.
+
+        // // TODO: Also restrict the element type mapping based on the user-specified store type?
+        // var elementType = clrType == typeof(MultiPoint)
+        //     ? typeof(Point)
+        //     : clrType == typeof(MultiLineString)
+        //         ? typeof(LineString)
+        //         : clrType == typeof(MultiPolygon)
+        //             ? typeof(Polygon)
+        //             : clrType == typeof(GeometryCollection)
+        //                 ? typeof(Geometry)
+        //                 : null;
+        //
+        // if (elementType is not null)
+        // {
+        //     var elementTypeMapping = FindMapping(new() { ClrType = elementType })!;
+        //
+        //     typeMapping = typeMapping.Clone(elementMapping: elementTypeMapping);
+        // }
 
         return typeMapping;
     }

diff --git a/src/EFCore.PG.NodaTime/Storage/Internal/DateIntervalMultirangeMapping.cs b/src/EFCore.PG.NodaTime/Storage/Internal/DateIntervalMultirangeMapping.cs
@@ -51,15 +51,6 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
     public override RelationalTypeMapping Clone(string storeType, int? size)
         => new DateIntervalMultirangeMapping(Parameters.WithStoreTypeAndSize(storeType, size), _dateIntervalRangeMapping);
 
-    /// <summary>
-    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-    ///     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 CoreTypeMapping Clone(ValueConverter? converter)
-        => new DateIntervalMultirangeMapping(Parameters.WithComposedConverter(converter), _dateIntervalRangeMapping);
-
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
     ///     the same compatibility standards as public APIs. It may be changed or removed without notice in

diff --git a/src/EFCore.PG.NodaTime/Storage/Internal/DateIntervalRangeMapping.cs b/src/EFCore.PG.NodaTime/Storage/Internal/DateIntervalRangeMapping.cs
@@ -58,15 +58,6 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
     public override RelationalTypeMapping Clone(string storeType, int? size)
         => new DateIntervalRangeMapping(Parameters.WithStoreTypeAndSize(storeType, size));
 
-    /// <summary>
-    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-    ///     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 CoreTypeMapping Clone(ValueConverter? converter)
-        => new DateIntervalRangeMapping(Parameters.WithComposedConverter(converter));
-
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
     ///     the same compatibility standards as public APIs. It may be changed or removed without notice in

diff --git a/src/EFCore.PG.NodaTime/Storage/Internal/DateMapping.cs b/src/EFCore.PG.NodaTime/Storage/Internal/DateMapping.cs
@@ -51,15 +51,6 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
     public override RelationalTypeMapping Clone(string storeType, int? size)
         => new DateMapping(Parameters.WithStoreTypeAndSize(storeType, size));
 
-    /// <summary>
-    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-    ///     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 CoreTypeMapping Clone(ValueConverter? converter)
-        => new DateMapping(Parameters.WithComposedConverter(converter));
-
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
     ///     the same compatibility standards as public APIs. It may be changed or removed without notice in

diff --git a/src/EFCore.PG.NodaTime/Storage/Internal/DurationIntervalMapping.cs b/src/EFCore.PG.NodaTime/Storage/Internal/DurationIntervalMapping.cs
@@ -54,15 +54,6 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
     public override RelationalTypeMapping Clone(string storeType, int? size)
         => new DurationIntervalMapping(Parameters.WithStoreTypeAndSize(storeType, size));
 
-    /// <summary>
-    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-    ///     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 CoreTypeMapping Clone(ValueConverter? converter)
-        => new DurationIntervalMapping(Parameters.WithComposedConverter(converter));
-
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
     ///     the same compatibility standards as public APIs. It may be changed or removed without notice in

diff --git a/src/EFCore.PG.NodaTime/Storage/Internal/IntervalMultirangeMapping.cs b/src/EFCore.PG.NodaTime/Storage/Internal/IntervalMultirangeMapping.cs
@@ -51,15 +51,6 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
     public override RelationalTypeMapping Clone(string storeType, int? size)
         => new IntervalMultirangeMapping(Parameters.WithStoreTypeAndSize(storeType, size), _intervalRangeMapping);
 
-    /// <summary>
-    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-    ///     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 CoreTypeMapping Clone(ValueConverter? converter)
-        => new IntervalMultirangeMapping(Parameters.WithComposedConverter(converter), _intervalRangeMapping);
-
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
     ///     the same compatibility standards as public APIs. It may be changed or removed without notice in

diff --git a/src/EFCore.PG.NodaTime/Storage/Internal/IntervalRangeMapping.cs b/src/EFCore.PG.NodaTime/Storage/Internal/IntervalRangeMapping.cs
@@ -61,15 +61,6 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
     public override RelationalTypeMapping Clone(string storeType, int? size)
         => new IntervalRangeMapping(Parameters.WithStoreTypeAndSize(storeType, size));
 
-    /// <summary>
-    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-    ///     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 CoreTypeMapping Clone(ValueConverter? converter)
-        => new IntervalRangeMapping(Parameters.WithComposedConverter(converter));
-
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
     ///     the same compatibility standards as public APIs. It may be changed or removed without notice in

diff --git a/src/EFCore.PG.NodaTime/Storage/Internal/LegacyTimestampInstantMapping.cs b/src/EFCore.PG.NodaTime/Storage/Internal/LegacyTimestampInstantMapping.cs
@@ -53,15 +53,6 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
     public override RelationalTypeMapping Clone(string storeType, int? size)
         => new LegacyTimestampInstantMapping(Parameters.WithStoreTypeAndSize(storeType, size));
 
-    /// <summary>
-    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-    ///     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 CoreTypeMapping Clone(ValueConverter? converter)
-        => new LegacyTimestampInstantMapping(Parameters.WithComposedConverter(converter));
-
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
     ///     the same compatibility standards as public APIs. It may be changed or removed without notice in