From fd9e5ade73a265e883162f55fa60c46aaa9fb6c8 Mon Sep 17 00:00:00 2001 From: Udo Liess Date: Thu, 30 Jul 2015 12:11:30 +0200 Subject: [PATCH] ToUniversalTime() and ToLocalTime() should consider current DST --- src/Npgsql/NpgsqlTypes/NpgsqlDateTime.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Npgsql/NpgsqlTypes/NpgsqlDateTime.cs b/src/Npgsql/NpgsqlTypes/NpgsqlDateTime.cs index a27a50ca54..31ea76a3cb 100755 --- a/src/Npgsql/NpgsqlTypes/NpgsqlDateTime.cs +++ b/src/Npgsql/NpgsqlTypes/NpgsqlDateTime.cs @@ -179,7 +179,7 @@ public NpgsqlDateTime ToUniversalTime() case InternalType.FiniteUnspecified: // Treat as Local case InternalType.FiniteLocal: - return new NpgsqlDateTime(Subtract(TimeZoneInfo.Local.BaseUtcOffset).Ticks, DateTimeKind.Utc); + return new NpgsqlDateTime(this.DateTime.ToUniversalTime()); case InternalType.FiniteUtc: case InternalType.Infinity: case InternalType.NegativeInfinity: @@ -195,7 +195,7 @@ public NpgsqlDateTime ToLocalTime() case InternalType.FiniteUnspecified: // Treat as UTC case InternalType.FiniteUtc: - return new NpgsqlDateTime(Add(TimeZoneInfo.Local.BaseUtcOffset).Ticks, DateTimeKind.Local); + return new NpgsqlDateTime(this.DateTime.ToLocalTime()); case InternalType.FiniteLocal: case InternalType.Infinity: case InternalType.NegativeInfinity: