Depend on Npgsql 6.0.0-preview7

(cherry picked from commit af1ef24)
npgsql · Aug 16, 2021 · 1b0b321 · 1b0b321
1 parent dc91502
commit 1b0b321
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <EFCoreVersion>6.0.0-preview.7.21378.4</EFCoreVersion>
     <MicrosoftExtensionsVersion>6.0.0-preview.7.21377.19</MicrosoftExtensionsVersion>
-    <NpgsqlVersion>6.0.0-preview6</NpgsqlVersion>
+    <NpgsqlVersion>6.0.0-preview7</NpgsqlVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -26,4 +26,4 @@
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageVersion Include="GitHubActionsTestLogger" Version="1.2.0" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/EFCore.PG/Update/Internal/NpgsqlModificationCommandBatch.cs b/src/EFCore.PG/Update/Internal/NpgsqlModificationCommandBatch.cs
@@ -71,7 +71,11 @@ protected override bool IsCommandTextValid()
         protected override void Consume(RelationalDataReader reader)
         {
             var npgsqlReader = (NpgsqlDataReader)reader.DbDataReader;
+
+#pragma warning disable 618
             Debug.Assert(npgsqlReader.Statements.Count == ModificationCommands.Count, $"Reader has {npgsqlReader.Statements.Count} statements, expected {ModificationCommands.Count}");
+#pragma warning restore 618
+
             var commandIndex = 0;
 
             try
@@ -89,13 +93,15 @@ protected override void Consume(RelationalDataReader reader)
                     // make sure they executed
                     for (; commandIndex < nextPropagating; commandIndex++)
                     {
+#pragma warning disable 618
                         if (npgsqlReader.Statements[commandIndex].Rows == 0)
                         {
                             throw new DbUpdateConcurrencyException(
                                 RelationalStrings.UpdateConcurrencyException(1, 0),
                                 ModificationCommands[commandIndex].Entries
                             );
                         }
+#pragma warning restore 618
                     }
 
                     if (nextPropagating == ModificationCommands.Count)
@@ -139,7 +145,11 @@ protected override async Task ConsumeAsync(
             CancellationToken cancellationToken = default)
         {
             var npgsqlReader = (NpgsqlDataReader)reader.DbDataReader;
+
+#pragma warning disable 618
             Debug.Assert(npgsqlReader.Statements.Count == ModificationCommands.Count, $"Reader has {npgsqlReader.Statements.Count} statements, expected {ModificationCommands.Count}");
+#pragma warning restore 618
+
             var commandIndex = 0;
 
             try
@@ -158,13 +168,15 @@ protected override async Task ConsumeAsync(
                     // make sure they executed
                     for (; commandIndex < nextPropagating; commandIndex++)
                     {
+#pragma warning disable 618
                         if (npgsqlReader.Statements[commandIndex].Rows == 0)
                         {
                             throw new DbUpdateConcurrencyException(
                                 RelationalStrings.UpdateConcurrencyException(1, 0),
                                 ModificationCommands[commandIndex].Entries
                             );
                         }
+#pragma warning restore 618
                     }
 
                     if (nextPropagating == ModificationCommands.Count)