From af1ef248cedd07ccf9453c881f22c5c621261ff2 Mon Sep 17 00:00:00 2001
From: Shay Rojansky <roji@roji.org>
Date: Mon, 16 Aug 2021 15:18:37 +0200
Subject: [PATCH] Depend on Npgsql 6.0.0-preview7

---
 Directory.Packages.props                             |  2 +-
 .../Internal/NpgsqlModificationCommandBatch.cs       | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 91dc3609..6fcdd2a8 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <EFCoreVersion>6.0.0-rc.1.21406.1</EFCoreVersion>
     <MicrosoftExtensionsVersion>6.0.0-rc.1.21401.3</MicrosoftExtensionsVersion>
-    <NpgsqlVersion>6.0.0-preview6</NpgsqlVersion>
+    <NpgsqlVersion>6.0.0-preview7</NpgsqlVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.PG/Update/Internal/NpgsqlModificationCommandBatch.cs b/src/EFCore.PG/Update/Internal/NpgsqlModificationCommandBatch.cs
index 8be9a60d..2e51128b 100644
--- 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,6 +93,7 @@ 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(
@@ -96,6 +101,7 @@ protected override void Consume(RelationalDataReader reader)
                                 ModificationCommands[commandIndex].Entries
                             );
                         }
+#pragma warning restore 618
                     }
 
                     if (nextPropagating == ModificationCommands.Count)
@@ -139,7 +145,11 @@ protected override void Consume(RelationalDataReader reader)
             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,6 +168,7 @@ 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(
@@ -165,6 +176,7 @@ protected override void Consume(RelationalDataReader reader)
                                 ModificationCommands[commandIndex].Entries
                             );
                         }
+#pragma warning restore 618
                     }
 
                     if (nextPropagating == ModificationCommands.Count)
-- 
GitLab