提交 af1ef248 编写于 作者: S Shay Rojansky

Depend on Npgsql 6.0.0-preview7

上级 2cc15dbe
......@@ -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>
......
......@@ -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)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册