Skip to content

Remove BuiltInPostgresType attribute reflection #5375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NinoFloris merged 5 commits into from
Nov 14, 2023
Merged

Remove BuiltInPostgresType attribute reflection #5375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
52f5f2d
Remove attribute reflection
NinoFloris Nov 6, 2023
56caf7d
Reduce bloat
NinoFloris Nov 6, 2023
0198342
More direct approach
NinoFloris Nov 6, 2023
32ba30b
Remove DefaultPgTypes
NinoFloris Nov 6, 2023
e4ecf91
Fix typo
NinoFloris Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/Npgsql/Internal/Resolvers/RangeTypeInfoResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
using System.Numerics;
using Npgsql.Internal.Converters;
using Npgsql.Internal.Postgres;
using Npgsql.PostgresTypes;
using Npgsql.Properties;
using Npgsql.TypeMapping;
using Npgsql.Util;
using NpgsqlTypes;
using static Npgsql.Internal.PgConverterFactory;
Expand Down Expand Up @@ -343,24 +343,24 @@ public static void ThrowIfUnsupported<TBuilder>(Type? type, DataTypeName? dataTy
var kind = CheckUnsupported(type, dataTypeName, options);
switch (kind)
{
case PgTypeKind.Range when kind.Value.HasFlag(PgTypeKind.Array):
case PostgresTypeKind.Range when kind.Value.HasFlag(PostgresTypeKind.Array):
throw new NotSupportedException(
string.Format(NpgsqlStrings.RangeArraysNotEnabled, nameof(NpgsqlSlimDataSourceBuilder.EnableArrays), typeof(TBuilder).Name));
case PgTypeKind.Range:
case PostgresTypeKind.Range:
throw new NotSupportedException(
string.Format(NpgsqlStrings.RangesNotEnabled, nameof(NpgsqlSlimDataSourceBuilder.EnableRanges), typeof(TBuilder).Name));
case PgTypeKind.Multirange when kind.Value.HasFlag(PgTypeKind.Array):
case PostgresTypeKind.Multirange when kind.Value.HasFlag(PostgresTypeKind.Array):
throw new NotSupportedException(
string.Format(NpgsqlStrings.MultirangeArraysNotEnabled, nameof(NpgsqlSlimDataSourceBuilder.EnableArrays), typeof(TBuilder).Name));
case PgTypeKind.Multirange:
case PostgresTypeKind.Multirange:
throw new NotSupportedException(
string.Format(NpgsqlStrings.MultirangesNotEnabled, nameof(NpgsqlSlimDataSourceBuilder.EnableMultiranges), typeof(TBuilder).Name));
default:
return;
}
}

public static PgTypeKind? CheckUnsupported(Type? type, DataTypeName? dataTypeName, PgSerializerOptions options)
public static PostgresTypeKind? CheckUnsupported(Type? type, DataTypeName? dataTypeName, PgSerializerOptions options)
{
// Only trigger on well known data type names.
var npgsqlDbType = dataTypeName?.ToNpgsqlDbType();
Expand All @@ -371,12 +371,12 @@ public static void ThrowIfUnsupported<TBuilder>(Type? type, DataTypeName? dataTy

if (npgsqlDbType.Value.HasFlag(NpgsqlDbType.Range))
return dataTypeName?.IsArray == true
? PgTypeKind.Array | PgTypeKind.Range
: PgTypeKind.Range;
? PostgresTypeKind.Array | PostgresTypeKind.Range
: PostgresTypeKind.Range;

return dataTypeName?.IsArray == true
? PgTypeKind.Array | PgTypeKind.Multirange
: PgTypeKind.Multirange;
? PostgresTypeKind.Array | PostgresTypeKind.Multirange
: PostgresTypeKind.Multirange;
}

if (type == typeof(object))
Expand Down Expand Up @@ -407,10 +407,10 @@ public static void ThrowIfUnsupported<TBuilder>(Type? type, DataTypeName? dataTy
// If we don't know more than the clr type, default to a Multirange kind over Array as they share the same types.
foreach (var argument in matchingArguments)
if (argument == type)
return isArray ? PgTypeKind.Multirange : PgTypeKind.Range;
return isArray ? PostgresTypeKind.Multirange : PostgresTypeKind.Range;

if (type.AssemblyQualifiedName == "System.Numerics.BigInteger,System.Runtime.Numerics")
return isArray ? PgTypeKind.Multirange : PgTypeKind.Range;
return isArray ? PostgresTypeKind.Multirange : PostgresTypeKind.Range;
}

return null;
Expand Down
Loading