Skip to content

Make sure dbcommand is disposed #2656

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
merged 2 commits into from
Feb 14, 2021
Merged

Make sure dbcommand is disposed #2656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aacfa53
Make sure dbcommand is disposed
RogerKratz Jan 29, 2021
2471c71
Generate async
fredericDelaporte Jan 29, 2021
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
30 changes: 15 additions & 15 deletions src/NHibernate/AdoNet/GenericBatchingBatcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
using System.Text;
Expand Down Expand Up @@ -215,23 +214,24 @@ public int ExecuteNonQuery()
return 0;
}

var batcherCommand = _batcher.Driver.GenerateCommand(
using (var batcherCommand = _batcher.Driver.GenerateCommand(
_commandType,
_sql.ToSqlString(),
_sqlTypes.ToArray()
);
for (var i = 0; i < _parameters.Count; i++)
_sqlTypes.ToArray()))
{
var parameter = _parameters[i];
var cmdParam = batcherCommand.Parameters[i];
cmdParam.Value = parameter.Value;
cmdParam.Direction = parameter.Direction;
cmdParam.Precision = parameter.Precision;
cmdParam.Scale = parameter.Scale;
cmdParam.Size = parameter.Size;
for (var i = 0; i < _parameters.Count; i++)
{
var parameter = _parameters[i];
var cmdParam = batcherCommand.Parameters[i];
cmdParam.Value = parameter.Value;
cmdParam.Direction = parameter.Direction;
cmdParam.Precision = parameter.Precision;
cmdParam.Scale = parameter.Scale;
cmdParam.Size = parameter.Size;
}
_batcher.Prepare(batcherCommand);
return batcherCommand.ExecuteNonQuery();
}
_batcher.Prepare(batcherCommand);
return batcherCommand.ExecuteNonQuery();
}

public void Clear()
Expand Down
28 changes: 14 additions & 14 deletions src/NHibernate/Async/AdoNet/GenericBatchingBatcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
//------------------------------------------------------------------------------


using System;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
Expand Down Expand Up @@ -90,23 +89,24 @@ public async Task<int> ExecuteNonQueryAsync(CancellationToken cancellationToken)
return 0;
}

var batcherCommand = _batcher.Driver.GenerateCommand(
using (var batcherCommand = _batcher.Driver.GenerateCommand(
_commandType,
_sql.ToSqlString(),
_sqlTypes.ToArray()
);
for (var i = 0; i < _parameters.Count; i++)
_sqlTypes.ToArray()))
{
var parameter = _parameters[i];
var cmdParam = batcherCommand.Parameters[i];
cmdParam.Value = parameter.Value;
cmdParam.Direction = parameter.Direction;
cmdParam.Precision = parameter.Precision;
cmdParam.Scale = parameter.Scale;
cmdParam.Size = parameter.Size;
for (var i = 0; i < _parameters.Count; i++)
{
var parameter = _parameters[i];
var cmdParam = batcherCommand.Parameters[i];
cmdParam.Value = parameter.Value;
cmdParam.Direction = parameter.Direction;
cmdParam.Precision = parameter.Precision;
cmdParam.Scale = parameter.Scale;
cmdParam.Size = parameter.Size;
}
await (_batcher.PrepareAsync(batcherCommand, cancellationToken)).ConfigureAwait(false);
return await (batcherCommand.ExecuteNonQueryAsync(cancellationToken)).ConfigureAwait(false);
}
await (_batcher.PrepareAsync(batcherCommand, cancellationToken)).ConfigureAwait(false);
return await (batcherCommand.ExecuteNonQueryAsync(cancellationToken)).ConfigureAwait(false);
}
}
}
Expand Down