Depend on Npgsql 6.0.0 GA

npgsql · Nov 9, 2021 · 025fc55 · 025fc55
1 parent d10fb38
commit 025fc55
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 22 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -12,7 +12,7 @@
 
     <Copyright>Copyright 2021 © The Npgsql Development Team</Copyright>
     <Company>Npgsql</Company>
-    <VersionPrefix>6.0.0-rtm</VersionPrefix>
+    <VersionPrefix>6.0.0</VersionPrefix>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <PackageLicenseExpression>PostgreSQL</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/npgsql/efcore.pg</PackageProjectUrl>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <EFCoreVersion>6.0.0</EFCoreVersion>
     <MicrosoftExtensionsVersion>6.0.0</MicrosoftExtensionsVersion>
-    <NpgsqlVersion>6.0.0-rtm-ci.20211108T102656</NpgsqlVersion>
+    <NpgsqlVersion>6.0.0</NpgsqlVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/NuGet.config b/NuGet.config
diff --git a/test/EFCore.PG.FunctionalTests/BuiltInDataTypesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/BuiltInDataTypesNpgsqlTest.cs
@@ -486,7 +486,7 @@ public virtual void Can_insert_and_read_back_all_mapped_data_types()
 @p5='h' (Nullable = false)
 @p6='2015-01-02T00:00:00.0000000' (DbType = Date)
 @p7='2015-01-02T10:11:12.0000000' (DbType = DateTime)
-@p8='2016-01-02T11:11:12.0000000Z' (DbType = DateTimeOffset)
+@p8='2016-01-02T11:11:12.0000000Z' (DbType = DateTime)
 @p9='0001-01-01T12:00:00.0000000+02:00' (DbType = Object)
 @p10='101.7'
 @p11='81.1' (DbType = Currency)

diff --git a/test/EFCore.PG.FunctionalTests/Query/GearsOfWarQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/GearsOfWarQueryNpgsqlTest.cs
@@ -163,8 +163,8 @@ await AssertQuery(
                     m => start <= m.Timeline.Date && m.Timeline < end && dates.Contains(m.Timeline)));
 
             AssertSql(
-                @"@__start_0='1902-01-01T10:00:00.1234567+00:00'
-@__end_1='1902-01-03T10:00:00.1234567+00:00'
+                @"@__start_0='1902-01-01T10:00:00.1234567+00:00' (DbType = DateTime)
+@__end_1='1902-01-03T10:00:00.1234567+00:00' (DbType = DateTime)
 @__dates_2={ '1902-01-02T10:00:00.1234567+00:00' } (DbType = Object)
 
 SELECT m.""Id"", m.""CodeName"", m.""Date"", m.""Duration"", m.""Rating"", m.""Time"", m.""Timeline""

diff --git a/test/EFCore.PG.FunctionalTests/Query/JsonPocoQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/JsonPocoQueryTest.cs
@@ -161,7 +161,7 @@ public void Output_DateTime()
 
             Assert.Equal("Moe", x.Customer.Name);
             AssertSql(
-                @"@__p_0='1990-03-03T17:10:15.0000000Z' (DbType = DateTimeOffset)
+                @"@__p_0='1990-03-03T17:10:15.0000000Z' (DbType = DateTime)
 
 SELECT j.""Id"", j.""Customer"", j.""ToplevelArray""
 FROM ""JsonbEntities"" AS j
@@ -178,7 +178,7 @@ public void Output_DateTimeOffset()
 
             Assert.Equal("Moe", x.Customer.Name);
             AssertSql(
-                @"@__p_0='1990-03-03T17:10:15.0000000+00:00'
+                @"@__p_0='1990-03-03T17:10:15.0000000+00:00' (DbType = DateTime)
 
 SELECT j.""Id"", j.""Customer"", j.""ToplevelArray""
 FROM ""JsonbEntities"" AS j

diff --git a/test/EFCore.PG.FunctionalTests/Query/LegacyTimestampQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/LegacyTimestampQueryTest.cs
@@ -52,7 +52,7 @@ public virtual async Task Where_datetime_now()
             _ = await ctx.Entities.Where(c => DateTime.Now != myDatetime).ToListAsync();
 
             AssertSql(
-                @"@__myDatetime_0='2015-04-10T00:00:00.0000000Z' (DbType = DateTimeOffset)
+                @"@__myDatetime_0='2015-04-10T00:00:00.0000000Z' (DbType = DateTime)
 
 SELECT e.""Id"", e.""TimestampDateTime"", e.""TimestampDateTimeOffset"", e.""TimestamptzDateTime""
 FROM ""Entities"" AS e

diff --git a/test/EFCore.PG.FunctionalTests/Query/TPTGearsOfWarQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/TPTGearsOfWarQueryNpgsqlTest.cs
@@ -50,8 +50,8 @@ await AssertQuery(
                     m => start <= m.Timeline.Date && m.Timeline < end && dates.Contains(m.Timeline)));
 
             AssertSql(
-                @"@__start_0='1902-01-01T10:00:00.1234567+00:00'
-@__end_1='1902-01-03T10:00:00.1234567+00:00'
+                @"@__start_0='1902-01-01T10:00:00.1234567+00:00' (DbType = DateTime)
+@__end_1='1902-01-03T10:00:00.1234567+00:00' (DbType = DateTime)
 @__dates_2={ '1902-01-02T10:00:00.1234567+00:00' } (DbType = Object)
 
 SELECT m.""Id"", m.""CodeName"", m.""Date"", m.""Duration"", m.""Rating"", m.""Time"", m.""Timeline""

diff --git a/test/EFCore.PG.FunctionalTests/Query/TimestampQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/TimestampQueryTest.cs
@@ -199,7 +199,7 @@ await AssertQuery(
                 entryCount: 1);
 
             AssertSql(
-                @"@__dateTime_0='1998-04-12T13:26:38.0000000Z' (DbType = DateTimeOffset)
+                @"@__dateTime_0='1998-04-12T13:26:38.0000000Z' (DbType = DateTime)
 
 SELECT e.""Id"", e.""TimestampDateTime"", e.""TimestampDateTimeArray"", e.""TimestampDateTimeOffset"", e.""TimestampDateTimeOffsetArray"", e.""TimestampDateTimeRange"", e.""TimestamptzDateTime"", e.""TimestamptzDateTimeArray"", e.""TimestamptzDateTimeRange""
 FROM ""Entities"" AS e
@@ -333,7 +333,7 @@ await AssertQuery(
                 entryCount: 2);
 
             AssertSql(
-                @"@__myDatetime_0='2015-04-10T00:00:00.0000000Z' (DbType = DateTimeOffset)
+                @"@__myDatetime_0='2015-04-10T00:00:00.0000000Z' (DbType = DateTime)
 
 SELECT e.""Id"", e.""TimestampDateTime"", e.""TimestampDateTimeArray"", e.""TimestampDateTimeOffset"", e.""TimestampDateTimeOffsetArray"", e.""TimestampDateTimeRange"", e.""TimestamptzDateTime"", e.""TimestamptzDateTimeArray"", e.""TimestamptzDateTimeRange""
 FROM ""Entities"" AS e

diff --git a/test/EFCore.PG.NodaTime.FunctionalTests/NodaTimeQueryNpgsqlTest.cs b/test/EFCore.PG.NodaTime.FunctionalTests/NodaTimeQueryNpgsqlTest.cs
@@ -319,7 +319,7 @@ await AssertQuery(
                 entryCount: 1);
 
             AssertSql(
-                @"@__ToInstant_0='2018-04-20T08:31:33Z' (DbType = DateTimeOffset)
+                @"@__ToInstant_0='2018-04-20T08:31:33Z' (DbType = DateTime)
 
 SELECT n.""Id"", n.""DateInterval"", n.""Duration"", n.""Instant"", n.""InstantRange"", n.""Interval"", n.""LocalDate"", n.""LocalDate2"", n.""LocalDateRange"", n.""LocalDateTime"", n.""LocalTime"", n.""Long"", n.""OffsetTime"", n.""Period"", n.""ZonedDateTime""
 FROM ""NodaTimeTypes"" AS n
@@ -1149,7 +1149,7 @@ await AssertQuery(
                 entryCount: 1);
 
             AssertSql(
-                @"@__p_0='2018-04-20T10:31:33 UTC (+00)' (DbType = DateTimeOffset)
+                @"@__p_0='2018-04-20T10:31:33 UTC (+00)' (DbType = DateTime)
 
 SELECT n.""Id"", n.""DateInterval"", n.""Duration"", n.""Instant"", n.""InstantRange"", n.""Interval"", n.""LocalDate"", n.""LocalDate2"", n.""LocalDateRange"", n.""LocalDateTime"", n.""LocalTime"", n.""Long"", n.""OffsetTime"", n.""Period"", n.""ZonedDateTime""
 FROM ""NodaTimeTypes"" AS n
@@ -1383,7 +1383,7 @@ await AssertQuery(
                 entryCount: 1);
 
             AssertSql(
-                @"@__ToInstant_0='2018-04-20T10:31:33Z' (DbType = DateTimeOffset)
+                @"@__ToInstant_0='2018-04-20T10:31:33Z' (DbType = DateTime)
 
 SELECT n.""Id"", n.""DateInterval"", n.""Duration"", n.""Instant"", n.""InstantRange"", n.""Interval"", n.""LocalDate"", n.""LocalDate2"", n.""LocalDateRange"", n.""LocalDateTime"", n.""LocalTime"", n.""Long"", n.""OffsetTime"", n.""Period"", n.""ZonedDateTime""
 FROM ""NodaTimeTypes"" AS n