X Tutup
Skip to content

Fix reusing NpgsqlBatch with auto prepare #6433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vonzshik merged 1 commit into from
Feb 2, 2026
Merged

Fix reusing NpgsqlBatch with auto prepare #6433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/Npgsql/NpgsqlBatchCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ internal PreparedStatement? PreparedStatement
get => _preparedStatement is { State: PreparedState.Unprepared }
? _preparedStatement = null
: _preparedStatement;
set => _preparedStatement = value;
private set => _preparedStatement = value;
}

PreparedStatement? _preparedStatement;
Expand Down Expand Up @@ -274,7 +274,11 @@ internal void ApplyCommandComplete(CommandCompleteMessage msg)
OID = msg.OID;
}

internal void ResetPreparation() => ConnectorPreparedOn = null;
internal void ResetPreparation()
{
ConnectorPreparedOn = null;
PreparedStatement = null;
}

internal void PopulateOutputParameters(NpgsqlDataReader reader, ILogger logger)
{
Expand Down
13 changes: 7 additions & 6 deletions src/Npgsql/NpgsqlCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,12 @@ internal CommandState State
}
}

internal void ResetPreparation() => _connectorPreparedOn = null;
internal void ResetPreparation()
{
_connectorPreparedOn = null;
foreach (var s in InternalBatchCommands)
s.ResetPreparation();
}

#endregion State management

Expand Down Expand Up @@ -873,7 +878,7 @@ async Task Unprepare(bool async, CancellationToken cancellationToken = default)
if (!pStatement.IsExplicit)
connector.PreparedStatementManager.AutoPrepared[pStatement.AutoPreparedSlotIndex] = null;

batchCommand.PreparedStatement = null;
batchCommand.ResetPreparation();
}
}

Expand Down Expand Up @@ -1441,8 +1446,6 @@ internal virtual async ValueTask<NpgsqlDataReader> ExecuteReader(bool async, Com
{
if (batchCommand.ConnectorPreparedOn != connector)
{
foreach (var s in InternalBatchCommands)
s.ResetPreparation();
ResetPreparation();
goto case false;
}
Expand All @@ -1455,8 +1458,6 @@ internal virtual async ValueTask<NpgsqlDataReader> ExecuteReader(bool async, Com
if (_connectorPreparedOn != connector)
{
// The command was prepared, but since then the connector has changed. Detach all prepared statements.
foreach (var s in InternalBatchCommands)
s.PreparedStatement = null;
ResetPreparation();
goto case false;
}
Expand Down
2 changes: 0 additions & 2 deletions src/Npgsql/NpgsqlDataReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,8 +559,6 @@ async Task<bool> NextResult(bool async, bool isConsuming = false, CancellationTo
{
preparedStatement.State = PreparedState.Invalidated;
Command.ResetPreparation();
foreach (var s in Command.InternalBatchCommands)
s.ResetPreparation();
}
}

Expand Down
27 changes: 27 additions & 0 deletions test/Npgsql.Tests/AutoPrepareTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,33 @@ public async Task Auto_prepared_statement_invalidation()
Assert.DoesNotThrowAsync(() => command.ExecuteNonQueryAsync());
}

[Test, IssueLink("https://github.com/npgsql/npgsql/issues/6432")]
public async Task Reuse_batch_with_different_connectors()
{
await using var dataSource = CreateDataSource(csb =>
{
csb.MaxAutoPrepare = 10;
csb.AutoPrepareMinUsages = 2;
});
await using var batch = new NpgsqlBatch();
batch.BatchCommands.Add(new NpgsqlBatchCommand("SELECT 1"));
await using (var connection = await dataSource.OpenConnectionAsync())
{
batch.Connection = connection;

for (var i = 0; i < 2; i++)
await batch.ExecuteNonQueryAsync();
}

dataSource.Clear();

await using (var connection = await dataSource.OpenConnectionAsync())
{
batch.Connection = connection;
await batch.ExecuteNonQueryAsync();
}
}

void DumpPreparedStatements(NpgsqlConnection conn)
{
using var cmd = new NpgsqlCommand("SELECT name,statement FROM pg_prepared_statements", conn);
Expand Down
Loading
X Tutup