Skip to content

Improve type mapping collection code #5920

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 4 commits into from
Nov 16, 2024
Merged

Improve type mapping collection code #5920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec4f2ac
Add most used CreateInfo overloads for evolvability and binary size
NinoFloris Nov 10, 2024
9a68a33
Rename resolvedDataTypeName and name it consistently
NinoFloris Nov 10, 2024
a7e5404
Improve comments
NinoFloris Nov 16, 2024
1a7485e
Add explanation
NinoFloris Nov 16, 2024
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
16 changes: 8 additions & 8 deletions src/Npgsql/Internal/ResolverFactories/AdoTypeInfoResolverFactory.Multirange.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,18 +74,18 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings)
else
{
mappings.AddResolverType<NpgsqlRange<DateTime>[]>(DataTypeNames.TsMultirange,
static (options, mapping, dataTypeNameMatch) => mapping.CreateInfo(options,
static (options, mapping, requiresDataTypeName) => mapping.CreateInfo(options,
DateTimeConverterResolver.CreateMultirangeResolver<NpgsqlRange<DateTime>[], NpgsqlRange<DateTime>>(options,
options.GetCanonicalTypeId(DataTypeNames.TsTzMultirange),
options.GetCanonicalTypeId(DataTypeNames.TsMultirange),
options.EnableDateTimeInfinityConversions), dataTypeNameMatch),
options.EnableDateTimeInfinityConversions), requiresDataTypeName),
isDefault: true);
mappings.AddResolverType<List<NpgsqlRange<DateTime>>>(DataTypeNames.TsMultirange,
static (options, mapping, dataTypeNameMatch) => mapping.CreateInfo(options,
static (options, mapping, requiresDataTypeName) => mapping.CreateInfo(options,
DateTimeConverterResolver.CreateMultirangeResolver<List<NpgsqlRange<DateTime>>, NpgsqlRange<DateTime>>(options,
options.GetCanonicalTypeId(DataTypeNames.TsTzMultirange),
options.GetCanonicalTypeId(DataTypeNames.TsMultirange),
options.EnableDateTimeInfinityConversions), dataTypeNameMatch));
options.EnableDateTimeInfinityConversions), requiresDataTypeName));
}

mappings.AddType<NpgsqlRange<long>[]>(DataTypeNames.TsMultirange,
Expand Down Expand Up @@ -126,18 +126,18 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings)
else
{
mappings.AddResolverType<NpgsqlRange<DateTime>[]>(DataTypeNames.TsTzMultirange,
static (options, mapping, dataTypeNameMatch) => mapping.CreateInfo(options,
static (options, mapping, requiresDataTypeName) => mapping.CreateInfo(options,
DateTimeConverterResolver.CreateMultirangeResolver<NpgsqlRange<DateTime>[], NpgsqlRange<DateTime>>(options,
options.GetCanonicalTypeId(DataTypeNames.TsTzMultirange),
options.GetCanonicalTypeId(DataTypeNames.TsMultirange),
options.EnableDateTimeInfinityConversions), dataTypeNameMatch),
options.EnableDateTimeInfinityConversions), requiresDataTypeName),
isDefault: true);
mappings.AddResolverType<List<NpgsqlRange<DateTime>>>(DataTypeNames.TsTzMultirange,
static (options, mapping, dataTypeNameMatch) => mapping.CreateInfo(options,
static (options, mapping, requiresDataTypeName) => mapping.CreateInfo(options,
DateTimeConverterResolver.CreateMultirangeResolver<List<NpgsqlRange<DateTime>>, NpgsqlRange<DateTime>>(options,
options.GetCanonicalTypeId(DataTypeNames.TsTzMultirange),
options.GetCanonicalTypeId(DataTypeNames.TsMultirange),
options.EnableDateTimeInfinityConversions), dataTypeNameMatch));
options.EnableDateTimeInfinityConversions), requiresDataTypeName));
mappings.AddType<NpgsqlRange<DateTimeOffset>[]>(DataTypeNames.TsTzMultirange,
static (options, mapping, _) =>
mapping.CreateInfo(options, CreateArrayMultirangeConverter(
Expand Down
8 changes: 4 additions & 4 deletions src/Npgsql/Internal/ResolverFactories/AdoTypeInfoResolverFactory.Range.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings)
else
{
mappings.AddResolverStructType<NpgsqlRange<DateTime>>(DataTypeNames.TsRange,
static (options, mapping, dataTypeNameMatch) => mapping.CreateInfo(options,
static (options, mapping, requiresDataTypeName) => mapping.CreateInfo(options,
DateTimeConverterResolver.CreateRangeResolver(options,
options.GetCanonicalTypeId(DataTypeNames.TsTzRange),
options.GetCanonicalTypeId(DataTypeNames.TsRange),
options.EnableDateTimeInfinityConversions), dataTypeNameMatch),
options.EnableDateTimeInfinityConversions), requiresDataTypeName),
isDefault: true);
}
mappings.AddStructType<NpgsqlRange<long>>(DataTypeNames.TsRange,
Expand All @@ -73,11 +73,11 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings)
else
{
mappings.AddResolverStructType<NpgsqlRange<DateTime>>(DataTypeNames.TsTzRange,
static (options, mapping, dataTypeNameMatch) => mapping.CreateInfo(options,
static (options, mapping, requiresDataTypeName) => mapping.CreateInfo(options,
DateTimeConverterResolver.CreateRangeResolver(options,
options.GetCanonicalTypeId(DataTypeNames.TsTzRange),
options.GetCanonicalTypeId(DataTypeNames.TsRange),
options.EnableDateTimeInfinityConversions), dataTypeNameMatch),
options.EnableDateTimeInfinityConversions), requiresDataTypeName),
isDefault: true);
mappings.AddStructType<NpgsqlRange<DateTimeOffset>>(DataTypeNames.TsTzRange,
static (options, mapping, _) => mapping.CreateInfo(options,
Expand Down
12 changes: 6 additions & 6 deletions src/Npgsql/Internal/ResolverFactories/AdoTypeInfoResolverFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings)
// Varbit
mappings.AddType<object>(DataTypeNames.Varbit,
static (options, mapping, _) => mapping.CreateInfo(options,
new PolymorphicBitStringConverterResolver(options.GetCanonicalTypeId(DataTypeNames.Varbit)), supportsWriting: false));
new PolymorphicBitStringConverterResolver(options.GetCanonicalTypeId(DataTypeNames.Varbit)), includeDataTypeName: true, supportsWriting: false));
mappings.AddType<BitArray>(DataTypeNames.Varbit,
static (options, mapping, _) => mapping.CreateInfo(options, new BitArrayBitStringConverter()), isDefault: true);
mappings.AddStructType<bool>(DataTypeNames.Varbit,
Expand All @@ -183,7 +183,7 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings)
// Bit
mappings.AddType<object>(DataTypeNames.Bit,
static (options, mapping, _) => mapping.CreateInfo(options,
new PolymorphicBitStringConverterResolver(options.GetCanonicalTypeId(DataTypeNames.Bit)), supportsWriting: false));
new PolymorphicBitStringConverterResolver(options.GetCanonicalTypeId(DataTypeNames.Bit)), includeDataTypeName: true, supportsWriting: false));
mappings.AddType<BitArray>(DataTypeNames.Bit,
static (options, mapping, _) => mapping.CreateInfo(options, new BitArrayBitStringConverter()), isDefault: true);
mappings.AddStructType<bool>(DataTypeNames.Bit,
Expand All @@ -201,9 +201,9 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings)
else
{
mappings.AddResolverStructType<DateTime>(DataTypeNames.Timestamp,
static (options, mapping, dataTypeNameMatch) => mapping.CreateInfo(options,
static (options, mapping, requiresDataTypeName) => mapping.CreateInfo(options,
DateTimeConverterResolver.CreateResolver(options, options.GetCanonicalTypeId(DataTypeNames.TimestampTz), options.GetCanonicalTypeId(DataTypeNames.Timestamp),
options.EnableDateTimeInfinityConversions), dataTypeNameMatch), isDefault: true);
options.EnableDateTimeInfinityConversions), requiresDataTypeName), isDefault: true);
}
mappings.AddStructType<long>(DataTypeNames.Timestamp,
static (options, mapping, _) => mapping.CreateInfo(options, new Int8Converter<long>()));
Expand All @@ -220,9 +220,9 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings)
else
{
mappings.AddResolverStructType<DateTime>(DataTypeNames.TimestampTz,
static (options, mapping, dataTypeNameMatch) => mapping.CreateInfo(options,
static (options, mapping, requiresDataTypeName) => mapping.CreateInfo(options,
DateTimeConverterResolver.CreateResolver(options, options.GetCanonicalTypeId(DataTypeNames.TimestampTz), options.GetCanonicalTypeId(DataTypeNames.Timestamp),
options.EnableDateTimeInfinityConversions), dataTypeNameMatch), isDefault: true);
options.EnableDateTimeInfinityConversions), requiresDataTypeName), isDefault: true);
mappings.AddStructType<DateTimeOffset>(DataTypeNames.TimestampTz,
static (options, mapping, _) => mapping.CreateInfo(options, new DateTimeOffsetConverter(options.EnableDateTimeInfinityConversions)));
}
Expand Down
Loading