Skip to content

Redo timestamp handling #3969

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
roji merged 10 commits into from
Sep 13, 2021
Merged

Redo timestamp handling #3969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5bb0fae
Redo timestamp handling
roji Aug 26, 2021
bf76fd9
Generic value type writing
roji Sep 10, 2021
5506243
Tiny fix to mappings in CLR
roji Sep 10, 2021
dcb97c6
Fix call resolution...
roji Sep 10, 2021
230a86f
Add note on mixing Kinds
roji Sep 10, 2021
68866ea
Expose user type mapping info, e.g. for EF Core
roji Sep 12, 2021
44fed8a
Properly handle missing types in PG
roji Sep 12, 2021
7558e01
Update src/Npgsql/Internal/TypeHandlers/DateTimeHandlers/TimestampHan…
roji Sep 13, 2021
0f75c53
Update src/Npgsql/Internal/TypeHandlers/DateTimeHandlers/TimestampHan…
roji Sep 13, 2021
a1db651
Update src/Npgsql/Internal/TypeHandlers/DateTimeHandlers/DateTimeUtil…
roji Sep 13, 2021
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
1 change: 1 addition & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ jobs:
run: |
if [ -z "${{ matrix.pg_prerelease }}" ]; then
dotnet test -c ${{ matrix.config }} test/Npgsql.PluginTests --logger "GitHubActions;report-warnings=false"
dotnet test -c ${{ matrix.config }} test/Npgsql.NodaTime.Tests --logger "GitHubActions;report-warnings=false"
fi
shell: bash

Expand Down
11 changes: 11 additions & 0 deletions Npgsql.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Npgsql.SourceGenerators", "
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Npgsql.TrimmingTests", "test\Npgsql.TrimmingTests\Npgsql.TrimmingTests.csproj", "{844EC023-21B8-448D-93AD-5F6857F15DFF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Npgsql.NodaTime.Tests", "test\Npgsql.NodaTime.Tests\Npgsql.NodaTime.Tests.csproj", "{C00D2EB1-5719-4372-9E1C-5ED05DC23A00}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -133,6 +135,14 @@ Global
{844EC023-21B8-448D-93AD-5F6857F15DFF}.Release|Any CPU.Build.0 = Release|Any CPU
{844EC023-21B8-448D-93AD-5F6857F15DFF}.Release|x86.ActiveCfg = Release|Any CPU
{844EC023-21B8-448D-93AD-5F6857F15DFF}.Release|x86.Build.0 = Release|Any CPU
{C00D2EB1-5719-4372-9E1C-5ED05DC23A00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C00D2EB1-5719-4372-9E1C-5ED05DC23A00}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C00D2EB1-5719-4372-9E1C-5ED05DC23A00}.Debug|x86.ActiveCfg = Debug|Any CPU
{C00D2EB1-5719-4372-9E1C-5ED05DC23A00}.Debug|x86.Build.0 = Debug|Any CPU
{C00D2EB1-5719-4372-9E1C-5ED05DC23A00}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C00D2EB1-5719-4372-9E1C-5ED05DC23A00}.Release|Any CPU.Build.0 = Release|Any CPU
{C00D2EB1-5719-4372-9E1C-5ED05DC23A00}.Release|x86.ActiveCfg = Release|Any CPU
{C00D2EB1-5719-4372-9E1C-5ED05DC23A00}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -149,6 +159,7 @@ Global
{A77E5FAF-D775-4AB4-8846-8965C2104E60} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
{63026A19-60B8-4906-81CB-216F30E8094B} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
{844EC023-21B8-448D-93AD-5F6857F15DFF} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
{C00D2EB1-5719-4372-9E1C-5ED05DC23A00} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C90AEECD-DB4C-4BE6-B506-16A449852FB8}
Expand Down
18 changes: 10 additions & 8 deletions src/Npgsql.GeoJSON/Internal/GeoJSONTypeHandlerResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@

namespace Npgsql.GeoJSON.Internal
{
public class GeoJSONTypeHandlerResolver : ITypeHandlerResolver
public class GeoJSONTypeHandlerResolver : TypeHandlerResolver
{
readonly NpgsqlDatabaseInfo _databaseInfo;
readonly GeoJsonHandler _geometryHandler, _geographyHandler;
readonly GeoJsonHandler? _geometryHandler, _geographyHandler;
readonly bool _geographyAsDefault;

static readonly ConcurrentDictionary<string, CrsMap> CRSMaps = new();
Expand Down Expand Up @@ -47,19 +47,21 @@ internal GeoJSONTypeHandlerResolver(NpgsqlConnector connector, GeoJSONOptions op

var (pgGeometryType, pgGeographyType) = (PgType("geometry"), PgType("geography"));

_geometryHandler = new GeoJsonHandler(pgGeometryType, options, crsMap);
_geographyHandler = new GeoJsonHandler(pgGeographyType, options, crsMap);
if (pgGeometryType is not null)
_geometryHandler = new GeoJsonHandler(pgGeometryType, options, crsMap);
if (pgGeographyType is not null)
_geographyHandler = new GeoJsonHandler(pgGeographyType, options, crsMap);
}

public NpgsqlTypeHandler? ResolveByDataTypeName(string typeName)
public override NpgsqlTypeHandler? ResolveByDataTypeName(string typeName)
=> typeName switch
{
"geometry" => _geometryHandler,
"geography" => _geographyHandler,
_ => null
};

public NpgsqlTypeHandler? ResolveByClrType(Type type)
public override NpgsqlTypeHandler? ResolveByClrType(Type type)
=> ClrTypeToDataTypeName(type, _geographyAsDefault) is { } dataTypeName && ResolveByDataTypeName(dataTypeName) is { } handler
? handler
: null;
Expand All @@ -71,7 +73,7 @@ internal GeoJSONTypeHandlerResolver(NpgsqlConnector connector, GeoJSONOptions op
? "geography"
: "geometry";

public TypeMappingInfo? GetMappingByDataTypeName(string dataTypeName)
public override TypeMappingInfo? GetMappingByDataTypeName(string dataTypeName)
=> DoGetMappingByDataTypeName(dataTypeName);

internal static TypeMappingInfo? DoGetMappingByDataTypeName(string dataTypeName)
Expand All @@ -82,6 +84,6 @@ internal GeoJSONTypeHandlerResolver(NpgsqlConnector connector, GeoJSONOptions op
_ => null
};

PostgresType PgType(string pgTypeName) => _databaseInfo.GetPostgresTypeByName(pgTypeName);
PostgresType? PgType(string pgTypeName) => _databaseInfo.TryGetPostgresTypeByName(pgTypeName, out var pgType) ? pgType : null;
}
}
8 changes: 4 additions & 4 deletions src/Npgsql.GeoJSON/Internal/GeoJSONTypeHandlerResolverFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@

namespace Npgsql.GeoJSON.Internal
{
public class GeoJSONTypeHandlerResolverFactory : ITypeHandlerResolverFactory
public class GeoJSONTypeHandlerResolverFactory : TypeHandlerResolverFactory
{
readonly GeoJSONOptions _options;
readonly bool _geographyAsDefault;

public GeoJSONTypeHandlerResolverFactory(GeoJSONOptions options, bool geographyAsDefault)
=> (_options, _geographyAsDefault) = (options, geographyAsDefault);

public ITypeHandlerResolver Create(NpgsqlConnector connector)
public override TypeHandlerResolver Create(NpgsqlConnector connector)
=> new GeoJSONTypeHandlerResolver(connector, _options, _geographyAsDefault);

public string? GetDataTypeNameByClrType(Type type)
public override string? GetDataTypeNameByClrType(Type type)
=> GeoJSONTypeHandlerResolver.ClrTypeToDataTypeName(type, _geographyAsDefault);

public TypeMappingInfo? GetMappingByDataTypeName(string dataTypeName)
public override TypeMappingInfo? GetMappingByDataTypeName(string dataTypeName)
=> GeoJSONTypeHandlerResolver.DoGetMappingByDataTypeName(dataTypeName);
}
}
8 changes: 4 additions & 4 deletions src/Npgsql.Json.NET/Internal/JsonNetTypeHandlerResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

namespace Npgsql.Json.NET.Internal
{
public class JsonNetTypeHandlerResolver : ITypeHandlerResolver
public class JsonNetTypeHandlerResolver : TypeHandlerResolver
{
readonly NpgsqlDatabaseInfo _databaseInfo;
readonly JsonbHandler _jsonbHandler;
Expand Down Expand Up @@ -38,23 +38,23 @@ internal JsonNetTypeHandlerResolver(
_ => null
};

public NpgsqlTypeHandler? ResolveByDataTypeName(string typeName)
public override NpgsqlTypeHandler? ResolveByDataTypeName(string typeName)
=> typeName switch
{
"jsonb" => _jsonbHandler,
"json" => _jsonHandler,
_ => null
};

public NpgsqlTypeHandler? ResolveByClrType(Type type)
public override NpgsqlTypeHandler? ResolveByClrType(Type type)
=> ClrTypeToDataTypeName(type, _dataTypeNamesByClrType) is { } dataTypeName && ResolveByDataTypeName(dataTypeName) is { } handler
? handler
: null;

internal static string? ClrTypeToDataTypeName(Type type, Dictionary<Type, string> clrTypes)
=> clrTypes.TryGetValue(type, out var dataTypeName) ? dataTypeName : null;

public TypeMappingInfo? GetMappingByDataTypeName(string dataTypeName)
public override TypeMappingInfo? GetMappingByDataTypeName(string dataTypeName)
=> DoGetMappingByDataTypeName(dataTypeName);

internal static TypeMappingInfo? DoGetMappingByDataTypeName(string dataTypeName)
Expand Down
8 changes: 4 additions & 4 deletions src/Npgsql.Json.NET/Internal/JsonNetTypeHandlerResolverFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Npgsql.Json.NET.Internal
{
public class JsonNetTypeHandlerResolverFactory : ITypeHandlerResolverFactory
public class JsonNetTypeHandlerResolverFactory : TypeHandlerResolverFactory
{
readonly Type[] _jsonbClrTypes;
readonly Type[] _jsonClrTypes;
Expand All @@ -34,13 +34,13 @@ public JsonNetTypeHandlerResolverFactory(
_byType[type] = "json";
}

public ITypeHandlerResolver Create(NpgsqlConnector connector)
public override TypeHandlerResolver Create(NpgsqlConnector connector)
=> new JsonNetTypeHandlerResolver(connector, _byType, _settings);

public string? GetDataTypeNameByClrType(Type type)
public override string? GetDataTypeNameByClrType(Type type)
=> JsonNetTypeHandlerResolver.ClrTypeToDataTypeName(type, _byType);

public TypeMappingInfo? GetMappingByDataTypeName(string dataTypeName)
public override TypeMappingInfo? GetMappingByDataTypeName(string dataTypeName)
=> JsonNetTypeHandlerResolver.DoGetMappingByDataTypeName(dataTypeName);

}
Expand Down
18 changes: 10 additions & 8 deletions src/Npgsql.NetTopologySuite/Internal/NetTopologySuiteTypeHandlerResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@

namespace Npgsql.NetTopologySuite.Internal
{
public class NetTopologySuiteTypeHandlerResolver : ITypeHandlerResolver
public class NetTopologySuiteTypeHandlerResolver : TypeHandlerResolver
{
readonly NpgsqlDatabaseInfo _databaseInfo;
readonly bool _geographyAsDefault;

readonly NetTopologySuiteHandler _geometryHandler, _geographyHandler;
readonly NetTopologySuiteHandler? _geometryHandler, _geographyHandler;

internal NetTopologySuiteTypeHandlerResolver(
NpgsqlConnector connector,
Expand All @@ -33,19 +33,21 @@ internal NetTopologySuiteTypeHandlerResolver(
var reader = new PostGisReader(coordinateSequenceFactory, precisionModel, handleOrdinates);
var writer = new PostGisWriter();

_geometryHandler = new NetTopologySuiteHandler(pgGeometryType, reader, writer);
_geographyHandler = new NetTopologySuiteHandler(pgGeographyType, reader, writer);
if (pgGeometryType is not null)
_geometryHandler = new NetTopologySuiteHandler(pgGeometryType, reader, writer);
if (pgGeographyType is not null)
_geographyHandler = new NetTopologySuiteHandler(pgGeographyType, reader, writer);
}

public NpgsqlTypeHandler? ResolveByDataTypeName(string typeName)
public override NpgsqlTypeHandler? ResolveByDataTypeName(string typeName)
=> typeName switch
{
"geometry" => _geometryHandler,
"geography" => _geographyHandler,
_ => null
};

public NpgsqlTypeHandler? ResolveByClrType(Type type)
public override NpgsqlTypeHandler? ResolveByClrType(Type type)
=> ClrTypeToDataTypeName(type, _geographyAsDefault) is { } dataTypeName && ResolveByDataTypeName(dataTypeName) is { } handler
? handler
: null;
Expand All @@ -57,7 +59,7 @@ internal NetTopologySuiteTypeHandlerResolver(
? "geography"
: "geometry";

public TypeMappingInfo? GetMappingByDataTypeName(string dataTypeName)
public override TypeMappingInfo? GetMappingByDataTypeName(string dataTypeName)
=> DoGetMappingByDataTypeName(dataTypeName);

internal static TypeMappingInfo? DoGetMappingByDataTypeName(string dataTypeName)
Expand All @@ -68,6 +70,6 @@ internal NetTopologySuiteTypeHandlerResolver(
_ => null
};

PostgresType PgType(string pgTypeName) => _databaseInfo.GetPostgresTypeByName(pgTypeName);
PostgresType? PgType(string pgTypeName) => _databaseInfo.TryGetPostgresTypeByName(pgTypeName, out var pgType) ? pgType : null;
}
}
8 changes: 4 additions & 4 deletions src/Npgsql.NetTopologySuite/Internal/NetTopologySuiteTypeHandlerResolverFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace Npgsql.NetTopologySuite.Internal
{
public class NetTopologySuiteTypeHandlerResolverFactory : ITypeHandlerResolverFactory
public class NetTopologySuiteTypeHandlerResolverFactory : TypeHandlerResolverFactory
{
readonly CoordinateSequenceFactory _coordinateSequenceFactory;
readonly PrecisionModel _precisionModel;
Expand All @@ -27,14 +27,14 @@ public NetTopologySuiteTypeHandlerResolverFactory(
_geographyAsDefault = geographyAsDefault;
}

public ITypeHandlerResolver Create(NpgsqlConnector connector)
public override TypeHandlerResolver Create(NpgsqlConnector connector)
=> new NetTopologySuiteTypeHandlerResolver(connector, _coordinateSequenceFactory, _precisionModel, _handleOrdinates,
_geographyAsDefault);

public string? GetDataTypeNameByClrType(Type type)
public override string? GetDataTypeNameByClrType(Type type)
=> NetTopologySuiteTypeHandlerResolver.ClrTypeToDataTypeName(type, _geographyAsDefault);

public TypeMappingInfo? GetMappingByDataTypeName(string dataTypeName)
public override TypeMappingInfo? GetMappingByDataTypeName(string dataTypeName)
=> NetTopologySuiteTypeHandlerResolver.DoGetMappingByDataTypeName(dataTypeName);
}
}
60 changes: 60 additions & 0 deletions src/Npgsql.NodaTime/Internal/LegacyTimestampHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
using System;
using System.Diagnostics;
using NodaTime;
using Npgsql.BackendMessages;
using Npgsql.Internal;
using Npgsql.Internal.TypeHandling;
using Npgsql.PostgresTypes;
using BclTimestampHandler = Npgsql.Internal.TypeHandlers.DateTimeHandlers.TimestampHandler;

namespace Npgsql.NodaTime.Internal
{
sealed partial class LegacyTimestampHandler : NpgsqlSimpleTypeHandler<Instant>,
INpgsqlSimpleTypeHandler<LocalDateTime>, INpgsqlSimpleTypeHandler<DateTime>
{
readonly bool _convertInfinityDateTime;
readonly BclTimestampHandler _bclHandler;

internal LegacyTimestampHandler(PostgresType postgresType, bool convertInfinityDateTime)
: base(postgresType)
{
_convertInfinityDateTime = convertInfinityDateTime;
_bclHandler = new BclTimestampHandler(postgresType, convertInfinityDateTime);
}

#region Read

public override Instant Read(NpgsqlReadBuffer buf, int len, FieldDescription? fieldDescription = null)
=> TimestampTzHandler.ReadInstant(buf, _convertInfinityDateTime);

LocalDateTime INpgsqlSimpleTypeHandler<LocalDateTime>.Read(NpgsqlReadBuffer buf, int len, FieldDescription? fieldDescription)
=> TimestampHandler.ReadLocalDateTime(buf);

DateTime INpgsqlSimpleTypeHandler<DateTime>.Read(NpgsqlReadBuffer buf, int len, FieldDescription? fieldDescription)
=> _bclHandler.Read(buf, len, fieldDescription);

#endregion Read

#region Write

public override int ValidateAndGetLength(Instant value, NpgsqlParameter? parameter)
=> 8;

int INpgsqlSimpleTypeHandler<LocalDateTime>.ValidateAndGetLength(LocalDateTime value, NpgsqlParameter? parameter)
=> 8;

public override void Write(Instant value, NpgsqlWriteBuffer buf, NpgsqlParameter? parameter)
=> TimestampTzHandler.WriteInstant(value, buf, _convertInfinityDateTime);

void INpgsqlSimpleTypeHandler<LocalDateTime>.Write(LocalDateTime value, NpgsqlWriteBuffer buf, NpgsqlParameter? parameter)
=> TimestampHandler.WriteLocalDateTime(value, buf);

int INpgsqlSimpleTypeHandler<DateTime>.ValidateAndGetLength(DateTime value, NpgsqlParameter? parameter)
=> ((INpgsqlSimpleTypeHandler<DateTime>)_bclHandler).ValidateAndGetLength(value, parameter);

void INpgsqlSimpleTypeHandler<DateTime>.Write(DateTime value, NpgsqlWriteBuffer buf, NpgsqlParameter? parameter)
=> ((INpgsqlSimpleTypeHandler<DateTime>)_bclHandler).Write(value, buf, parameter);

#endregion Write
}
}
Loading