Refactor DefaultTypeHandlerFactory to remove reflection

As part of this, PostgresType can now be injected into handlers after construction. Closes #3815
npgsql · roji · Jun 7, 2021 · Jun 6, 2021 · Jun 6, 2021 · Jun 7, 2021
commit 84b5fd7649fc3338b9eb15189373129095163295
@@ -60,8 +60,8 @@ sealed partial class GeoJsonHandler : NpgsqlTypeHandler<GeoJSONObject>,
         int _lastSrid;
 
         internal GeoJsonHandler(PostgresType postgresType, GeoJSONOptions options, CrsMap crsMap)
-            : base(postgresType)
         {
+            PostgresType = postgresType;
             _options = options;
             _crsMap = crsMap;
         }

@@ -20,7 +20,8 @@ partial class LegacyPostgisHandler : NpgsqlTypeHandler<PostgisGeometry>,
         INpgsqlTypeHandler<PostgisPolygon>, INpgsqlTypeHandler<PostgisMultiPolygon>,
         INpgsqlTypeHandler<PostgisGeometryCollection>
     {
-        public LegacyPostgisHandler(PostgresType postgresType) : base(postgresType) {}
+        public LegacyPostgisHandler(PostgresType postgresType)
+            => PostgresType = postgresType;
 
         #region Read
 

@@ -25,8 +25,8 @@ partial class NetTopologySuiteHandler : NpgsqlTypeHandler<Geometry>,
         readonly LengthStream _lengthStream = new();
 
         internal NetTopologySuiteHandler(PostgresType postgresType, PostGisReader reader, PostGisWriter writer)
-            : base(postgresType)
         {
+            PostgresType = postgresType;
             _reader = reader;
             _writer = writer;
         }

@@ -28,8 +28,8 @@ sealed partial class DateHandler : NpgsqlSimpleTypeHandler<LocalDate>, INpgsqlSi
         readonly BclDateHandler _bclHandler;
 
         internal DateHandler(PostgresType postgresType, bool convertInfinityDateTime)
-            : base(postgresType)
         {
+            PostgresType = postgresType;
             _convertInfinityDateTime = convertInfinityDateTime;
             _bclHandler = new BclDateHandler(postgresType, convertInfinityDateTime);
         }

@@ -26,8 +26,11 @@ sealed partial class IntervalHandler :
     {
         readonly BclIntervalHandler _bclHandler;
 
-        internal IntervalHandler(PostgresType postgresType) : base(postgresType)
-            => _bclHandler = new BclIntervalHandler(postgresType);
+        internal IntervalHandler(PostgresType postgresType)
+        {
+            PostgresType = postgresType;
+            _bclHandler = new BclIntervalHandler(postgresType);
+        }
 
         public override Period Read(NpgsqlReadBuffer buf, int len, FieldDescription? fieldDescription = null)
         {

@@ -26,8 +26,11 @@ sealed partial class TimeHandler : NpgsqlSimpleTypeHandler<LocalTime>, INpgsqlSi
     {
         readonly BclTimeHandler _bclHandler;
 
-        internal TimeHandler(PostgresType postgresType) : base(postgresType)
-            => _bclHandler = new BclTimeHandler(postgresType);
+        internal TimeHandler(PostgresType postgresType)
+        {
+            PostgresType = postgresType;
+            _bclHandler = new BclTimeHandler(postgresType);
+        }
 
         // PostgreSQL time resolution == 1 microsecond == 10 ticks
         public override LocalTime Read(NpgsqlReadBuffer buf, int len, FieldDescription? fieldDescription = null)

@@ -22,8 +22,11 @@ sealed partial class TimeTzHandler : NpgsqlSimpleTypeHandler<OffsetTime>, INpgsq
     {
         readonly BclTimeTzHandler _bclHandler;
 
-        internal TimeTzHandler(PostgresType postgresType) : base(postgresType)
-            => _bclHandler = new BclTimeTzHandler(postgresType);
+        internal TimeTzHandler(PostgresType postgresType)
+        {
+            PostgresType = postgresType;
+            _bclHandler = new BclTimeTzHandler(postgresType);
+        }
 
         // Adjust from 1 microsecond to 100ns. Time zone (in seconds) is inverted.
         public override OffsetTime Read(NpgsqlReadBuffer buf, int len, FieldDescription? fieldDescription = null)

@@ -35,8 +35,8 @@ sealed partial class TimestampHandler : NpgsqlSimpleTypeHandler<Instant>, INpgsq
         readonly BclTimestampHandler _bclHandler;
 
         internal TimestampHandler(PostgresType postgresType, bool convertInfinityDateTime)
-            : base(postgresType)
         {
+            PostgresType = postgresType;
             _convertInfinityDateTime = convertInfinityDateTime;
             _bclHandler = new BclTimestampHandler(postgresType, convertInfinityDateTime);
         }

@@ -33,8 +33,8 @@ sealed partial class TimestampTzHandler : NpgsqlSimpleTypeHandler<Instant>, INpg
         readonly bool _convertInfinityDateTime;
 
         public TimestampTzHandler(PostgresType postgresType, bool convertInfinityDateTime)
-            : base(postgresType)
         {
+            PostgresType = postgresType;
             _dateTimeZoneProvider = DateTimeZoneProviders.Tzdb;
             _convertInfinityDateTime = convertInfinityDateTime;
             _bclHandler = new BclTimestampTzHandler(postgresType, convertInfinityDateTime);

@@ -35,8 +35,8 @@ public abstract class ArrayHandler : NpgsqlTypeHandler
 
         /// <inheritdoc />
         protected ArrayHandler(PostgresType arrayPostgresType, NpgsqlTypeHandler elementHandler, ArrayNullabilityMode arrayNullabilityMode, int lowerBound = 1)
-            : base(arrayPostgresType)
         {
+            PostgresType = arrayPostgresType;
             LowerBound = lowerBound;
             ElementHandler = elementHandler;
             ArrayNullabilityMode = arrayNullabilityMode;

@@ -8,8 +8,6 @@
 using Npgsql.BackendMessages;
 using Npgsql.Internal.TypeHandling;
 using Npgsql.PostgresTypes;
-using Npgsql.TypeMapping;
-using NpgsqlTypes;
 
 namespace Npgsql.Internal.TypeHandlers
 {
@@ -29,9 +27,6 @@ namespace Npgsql.Internal.TypeHandlers
     public partial class BitStringHandler : NpgsqlTypeHandler<BitArray>,
         INpgsqlTypeHandler<BitVector32>, INpgsqlTypeHandler<bool>, INpgsqlTypeHandler<string>
     {
-        /// <inheritdoc />
-        public BitStringHandler(PostgresType postgresType) : base(postgresType) {}
-
         internal override Type GetFieldType(FieldDescription? fieldDescription = null)
             => fieldDescription != null && fieldDescription.TypeModifier == 1 ? typeof(bool) : typeof(BitArray);
 

@@ -1,6 +1,5 @@
 using Npgsql.BackendMessages;
 using Npgsql.Internal.TypeHandling;
-using Npgsql.PostgresTypes;
 
 namespace Npgsql.Internal.TypeHandlers
 {
@@ -16,9 +15,6 @@ namespace Npgsql.Internal.TypeHandlers
     /// </remarks>
     public partial class BoolHandler : NpgsqlSimpleTypeHandler<bool>
     {
-        /// <inheritdoc />
-        public BoolHandler(PostgresType postgresType) : base(postgresType) {}
-
         /// <inheritdoc />
         public override bool Read(NpgsqlReadBuffer buf, int len, FieldDescription? fieldDescription = null)
             => buf.ReadByte() != 0;

@@ -3,7 +3,6 @@
 using System.Threading.Tasks;
 using Npgsql.BackendMessages;
 using Npgsql.Internal.TypeHandling;
-using Npgsql.PostgresTypes;
 
 namespace Npgsql.Internal.TypeHandlers
 {
@@ -22,11 +21,6 @@ public partial class ByteaHandler : NpgsqlTypeHandler<byte[]>, INpgsqlTypeHandle
         , INpgsqlTypeHandler<ReadOnlyMemory<byte>>, INpgsqlTypeHandler<Memory<byte>>
 #endif
     {
-        /// <summary>
-        /// Constructs a <see cref="ByteaHandler"/>.
-        /// </summary>
-        public ByteaHandler(PostgresType postgresType) : base(postgresType) {}
-
         /// <inheritdoc />
         public override async ValueTask<byte[]> Read(NpgsqlReadBuffer buf, int len, bool async, FieldDescription? fieldDescription = null)
         {

@@ -25,8 +25,8 @@ partial class CompositeHandler<T> : NpgsqlTypeHandler<T>, ICompositeHandler
         public Type CompositeType => typeof(T);
 
         public CompositeHandler(PostgresCompositeType postgresType, ConnectorTypeMapper typeMapper, INpgsqlNameTranslator nameTranslator)
-            : base(postgresType)
         {
+            PostgresType = postgresType;
             _typeMapper = typeMapper;
             _nameTranslator = nameTranslator;
         }

@@ -48,8 +48,10 @@ public partial class DateHandler : NpgsqlSimpleTypeHandlerWithPsv<DateTime, Npgs
         /// Constructs a <see cref="DateHandler"/>
         /// </summary>
         public DateHandler(PostgresType postgresType, bool convertInfinityDateTime)
-            : base(postgresType)
-            => _convertInfinityDateTime = convertInfinityDateTime;
+        {
+            PostgresType = postgresType;
+            _convertInfinityDateTime = convertInfinityDateTime;
+        }
 
         #region Read
 

@@ -41,7 +41,8 @@ public partial class IntervalHandler : NpgsqlSimpleTypeHandlerWithPsv<TimeSpan,
         /// <summary>
         /// Constructs an <see cref="IntervalHandler"/>
         /// </summary>
-        public IntervalHandler(PostgresType postgresType) : base(postgresType) {}
+        public IntervalHandler(PostgresType postgresType)
+            => PostgresType = postgresType;
 
         /// <inheritdoc />
         public override TimeSpan Read(NpgsqlReadBuffer buf, int len, FieldDescription? fieldDescription = null)

@@ -45,7 +45,8 @@ public partial class TimeHandler : NpgsqlSimpleTypeHandler<TimeSpan>
         /// <summary>
         /// Constructs a <see cref="TimeHandler"/>.
         /// </summary>
-        public TimeHandler(PostgresType postgresType) : base(postgresType) {}
+        public TimeHandler(PostgresType postgresType)
+            => PostgresType = postgresType;
 
         // PostgreSQL time resolution == 1 microsecond == 10 ticks
         /// <inheritdoc />

@@ -43,7 +43,8 @@ public partial class TimeTzHandler : NpgsqlSimpleTypeHandler<DateTimeOffset>, IN
         /// <summary>
         /// Constructs an <see cref="TimeTzHandler"/>.
         /// </summary>
-        public TimeTzHandler(PostgresType postgresType) : base(postgresType) {}
+        public TimeTzHandler(PostgresType postgresType)
+            => PostgresType = postgresType;
 
         #region Read
 

@@ -50,7 +50,10 @@ public partial class TimestampHandler : NpgsqlSimpleTypeHandlerWithPsv<DateTime,
         /// Constructs a <see cref="TimestampHandler"/>.
         /// </summary>
         public TimestampHandler(PostgresType postgresType, bool convertInfinityDateTime)
-            : base(postgresType) => ConvertInfinityDateTime = convertInfinityDateTime;
+        {
+            PostgresType = postgresType;
+            ConvertInfinityDateTime = convertInfinityDateTime;
+        }
 
         #region Read
 

@@ -32,9 +32,9 @@ partial class EnumHandler<TEnum> : NpgsqlSimpleTypeHandler<TEnum>, IEnumHandler
         #region Construction
 
         internal EnumHandler(PostgresType postgresType, Dictionary<TEnum, string> enumToLabel, Dictionary<string, TEnum> labelToEnum)
-            : base(postgresType)
         {
             Debug.Assert(typeof(TEnum).GetTypeInfo().IsEnum, "EnumHandler instantiated for non-enum type");
+            PostgresType = postgresType;
             _enumToLabel = enumToLabel;
             _labelToEnum = labelToEnum;
         }

@@ -5,8 +5,6 @@
 using System.Threading.Tasks;
 using Npgsql.BackendMessages;
 using Npgsql.Internal.TypeHandling;
-using Npgsql.PostgresTypes;
-using Npgsql.TypeMapping;
 using NpgsqlTypes;
 
 // TODO: Need to work on the nullability here
@@ -35,9 +33,6 @@ public partial class TsQueryHandler : NpgsqlTypeHandler<NpgsqlTsQuery>,
 
         readonly Stack<NpgsqlTsQuery> _stack = new();
 
-        /// <inheritdoc />
-        public TsQueryHandler(PostgresType postgresType) : base(postgresType) {}
-
         #region Read
 
         /// <inheritdoc />

@@ -6,8 +6,6 @@
 using System.Threading.Tasks;
 using Npgsql.BackendMessages;
 using Npgsql.Internal.TypeHandling;
-using Npgsql.PostgresTypes;
-using Npgsql.TypeMapping;
 using NpgsqlTypes;
 
 namespace Npgsql.Internal.TypeHandlers.FullTextSearchHandlers
@@ -28,9 +26,6 @@ public partial class TsVectorHandler : NpgsqlTypeHandler<NpgsqlTsVector>
         // 2 (num_pos) + sizeof(int16) * 256 (max_num_pos (positions/wegihts))
         const int MaxSingleLexemeBytes = 2561;
 
-        /// <inheritdoc />
-        public TsVectorHandler(PostgresType postgresType) : base(postgresType) {}
-
         #region Read
 
         /// <inheritdoc />

@@ -1,7 +1,5 @@
 using Npgsql.BackendMessages;
 using Npgsql.Internal.TypeHandling;
-using Npgsql.PostgresTypes;
-using Npgsql.TypeMapping;
 using NpgsqlTypes;
 
 namespace Npgsql.Internal.TypeHandlers.GeometricHandlers
@@ -18,9 +16,6 @@ namespace Npgsql.Internal.TypeHandlers.GeometricHandlers
     /// </remarks>
     public partial class BoxHandler : NpgsqlSimpleTypeHandler<NpgsqlBox>
     {
-        /// <inheritdoc />
-        public BoxHandler(PostgresType postgresType) : base(postgresType) {}
-
         /// <inheritdoc />
         public override NpgsqlBox Read(NpgsqlReadBuffer buf, int len, FieldDescription? fieldDescription = null)
             => new(

@@ -1,7 +1,5 @@
 using Npgsql.BackendMessages;
 using Npgsql.Internal.TypeHandling;
-using Npgsql.PostgresTypes;
-using Npgsql.TypeMapping;
 using NpgsqlTypes;
 
 namespace Npgsql.Internal.TypeHandlers.GeometricHandlers
@@ -18,9 +16,6 @@ namespace Npgsql.Internal.TypeHandlers.GeometricHandlers
     /// </remarks>
     public partial class CircleHandler : NpgsqlSimpleTypeHandler<NpgsqlCircle>
     {
-        /// <inheritdoc />
-        public CircleHandler(PostgresType postgresType) : base(postgresType) {}
-
         /// <inheritdoc />
         public override NpgsqlCircle Read(NpgsqlReadBuffer buf, int len, FieldDescription? fieldDescription = null)
             => new(buf.ReadDouble(), buf.ReadDouble(), buf.ReadDouble());

@@ -1,7 +1,5 @@
 using Npgsql.BackendMessages;
 using Npgsql.Internal.TypeHandling;
-using Npgsql.PostgresTypes;
-using Npgsql.TypeMapping;
 using NpgsqlTypes;
 
 namespace Npgsql.Internal.TypeHandlers.GeometricHandlers
@@ -18,9 +16,6 @@ namespace Npgsql.Internal.TypeHandlers.GeometricHandlers
     /// </remarks>
     public partial class LineHandler : NpgsqlSimpleTypeHandler<NpgsqlLine>
     {
-        /// <inheritdoc />
-        public LineHandler(PostgresType postgresType) : base(postgresType) {}
-
         /// <inheritdoc />
         public override NpgsqlLine Read(NpgsqlReadBuffer buf, int len, FieldDescription? fieldDescription = null)
             => new(buf.ReadDouble(), buf.ReadDouble(), buf.ReadDouble());

@@ -1,7 +1,5 @@
 using Npgsql.BackendMessages;
 using Npgsql.Internal.TypeHandling;
-using Npgsql.PostgresTypes;
-using Npgsql.TypeMapping;
 using NpgsqlTypes;
 
 namespace Npgsql.Internal.TypeHandlers.GeometricHandlers
@@ -18,9 +16,6 @@ namespace Npgsql.Internal.TypeHandlers.GeometricHandlers
     /// </remarks>
     public partial class LineSegmentHandler : NpgsqlSimpleTypeHandler<NpgsqlLSeg>
     {
-        /// <inheritdoc />
-        public LineSegmentHandler(PostgresType postgresType) : base(postgresType) {}
-
         /// <inheritdoc />
         public override NpgsqlLSeg Read(NpgsqlReadBuffer buf, int len, FieldDescription? fieldDescription = null)
             => new(buf.ReadDouble(), buf.ReadDouble(), buf.ReadDouble(), buf.ReadDouble());

@@ -3,8 +3,6 @@
 using System.Threading.Tasks;
 using Npgsql.BackendMessages;
 using Npgsql.Internal.TypeHandling;
-using Npgsql.PostgresTypes;
-using Npgsql.TypeMapping;
 using NpgsqlTypes;
 
 namespace Npgsql.Internal.TypeHandlers.GeometricHandlers
@@ -21,9 +19,6 @@ namespace Npgsql.Internal.TypeHandlers.GeometricHandlers
     /// </remarks>
     public partial class PathHandler : NpgsqlTypeHandler<NpgsqlPath>
     {
-        /// <inheritdoc />
-        public PathHandler(PostgresType postgresType) : base(postgresType) {}
-
         #region Read
 
         /// <inheritdoc />

@@ -1,6 +1,5 @@
 using Npgsql.BackendMessages;
 using Npgsql.Internal.TypeHandling;
-using Npgsql.PostgresTypes;
 using NpgsqlTypes;
 
 namespace Npgsql.Internal.TypeHandlers.GeometricHandlers
@@ -17,9 +16,6 @@ namespace Npgsql.Internal.TypeHandlers.GeometricHandlers
     /// </remarks>
     public partial class PointHandler : NpgsqlSimpleTypeHandler<NpgsqlPoint>
     {
-        /// <inheritdoc />
-        public PointHandler(PostgresType postgresType) : base(postgresType) {}
-
         /// <inheritdoc />
         public override NpgsqlPoint Read(NpgsqlReadBuffer buf, int len, FieldDescription? fieldDescription = null)
             => new(buf.ReadDouble(), buf.ReadDouble());