Skip to content

Use ThrowHelper for inline exception throws in NpgsqlConnection #6589

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

Open
LindqvistMartin wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −7
Open

Use ThrowHelper for inline exception throws in NpgsqlConnection #6589

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
14 changes: 7 additions & 7 deletions src/Npgsql/NpgsqlConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ public override void EnlistTransaction(Transaction? transaction)
try
{
if (EnlistedTransaction.TransactionInformation.Status == System.Transactions.TransactionStatus.Active)
throw new InvalidOperationException($"Already enlisted to transaction (localid={EnlistedTransaction.TransactionInformation.LocalIdentifier})");
ThrowHelper.ThrowInvalidOperationException($"Already enlisted to transaction (localid={EnlistedTransaction.TransactionInformation.LocalIdentifier})");
}
catch (ObjectDisposedException)
{
Expand Down Expand Up @@ -1085,7 +1085,7 @@ async Task<NpgsqlBinaryImporter> BeginBinaryImport(bool async, string copyFromCo
{
ArgumentNullException.ThrowIfNull(copyFromCommand);
if (!IsValidCopyCommand(copyFromCommand))
throw new ArgumentException("Must contain a COPY FROM STDIN command!", nameof(copyFromCommand));
ThrowHelper.ThrowArgumentException("Must contain a COPY FROM STDIN command!", nameof(copyFromCommand));

CheckReady();
var connector = Connector!;
Expand Down Expand Up @@ -1144,7 +1144,7 @@ async Task<NpgsqlBinaryExporter> BeginBinaryExport(bool async, string copyToComm
{
ArgumentNullException.ThrowIfNull(copyToCommand);
if (!IsValidCopyCommand(copyToCommand))
throw new ArgumentException("Must contain a COPY TO STDOUT command!", nameof(copyToCommand));
ThrowHelper.ThrowArgumentException("Must contain a COPY TO STDOUT command!", nameof(copyToCommand));

CheckReady();
var connector = Connector!;
Expand Down Expand Up @@ -1209,7 +1209,7 @@ async Task<NpgsqlCopyTextWriter> BeginTextImport(bool async, string copyFromComm
{
ArgumentNullException.ThrowIfNull(copyFromCommand);
if (!IsValidCopyCommand(copyFromCommand))
throw new ArgumentException("Must contain a COPY FROM STDIN command!", nameof(copyFromCommand));
ThrowHelper.ThrowArgumentException("Must contain a COPY FROM STDIN command!", nameof(copyFromCommand));

CheckReady();
var connector = Connector!;
Expand Down Expand Up @@ -1275,7 +1275,7 @@ async Task<NpgsqlCopyTextReader> BeginTextExport(bool async, string copyToComman
{
ArgumentNullException.ThrowIfNull(copyToCommand);
if (!IsValidCopyCommand(copyToCommand))
throw new ArgumentException("Must contain a COPY TO STDOUT command!", nameof(copyToCommand));
ThrowHelper.ThrowArgumentException("Must contain a COPY TO STDOUT command!", nameof(copyToCommand));

CheckReady();
var connector = Connector!;
Expand Down Expand Up @@ -1341,7 +1341,7 @@ async Task<NpgsqlRawCopyStream> BeginRawBinaryCopy(bool async, string copyComman
{
ArgumentNullException.ThrowIfNull(copyCommand);
if (!IsValidCopyCommand(copyCommand))
throw new ArgumentException("Must contain a COPY TO STDOUT OR COPY FROM STDIN command!", nameof(copyCommand));
ThrowHelper.ThrowArgumentException("Must contain a COPY TO STDOUT OR COPY FROM STDIN command!", nameof(copyCommand));

CheckReady();
var connector = Connector!;
Expand Down Expand Up @@ -1399,7 +1399,7 @@ async Task<NpgsqlRawCopyStream> BeginRawBinaryCopy(bool async, string copyComman
public bool Wait(int timeout)
{
if (timeout != -1 && timeout < 0)
throw new ArgumentException("Argument must be -1, 0 or positive", nameof(timeout));
ThrowHelper.ThrowArgumentException("Argument must be -1, 0 or positive", nameof(timeout));

CheckReady();

Expand Down