Skip to content

Remove a redundant argument in Linq provider ExecuteQuery. #1546

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 1 commit into from
Jan 22, 2018
Merged

Remove a redundant argument in Linq provider ExecuteQuery. #1546

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
14 changes: 14 additions & 0 deletions src/NHibernate/Async/Linq/DefaultQueryProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ public partial interface INhQueryProvider : IQueryProvider
public partial class DefaultQueryProvider : INhQueryProvider, IQueryProviderWithOptions
{

// Since v5.1
[Obsolete("Use ExecuteQuery(NhLinqExpression nhLinqExpression, IQuery query) instead")]
protected virtual async Task<object> ExecuteQueryAsync(NhLinqExpression nhLinqExpression, IQuery query, NhLinqExpression nhQuery, CancellationToken cancellationToken)
{
cancellationToken.ThrowIfCancellationRequested();
Expand All @@ -56,6 +58,18 @@ protected virtual async Task<object> ExecuteQueryAsync(NhLinqExpression nhLinqEx
return results[0];
}

protected virtual Task<object> ExecuteQueryAsync(NhLinqExpression nhLinqExpression, IQuery query, CancellationToken cancellationToken)
{
if (cancellationToken.IsCancellationRequested)
{
return Task.FromCanceled<object>(cancellationToken);
}
// For avoiding breaking derived classes, call the obsolete method until it is dropped.
#pragma warning disable 618
return ExecuteQueryAsync(nhLinqExpression, query, nhLinqExpression, cancellationToken);
#pragma warning restore 618
}

public Task<int> ExecuteDmlAsync<T>(QueryMode queryMode, Expression expression, CancellationToken cancellationToken)
{
if (cancellationToken.IsCancellationRequested)
Expand Down
17 changes: 13 additions & 4 deletions src/NHibernate/Linq/DefaultQueryProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,9 @@ protected virtual ISessionImplementor Session

public virtual object Execute(Expression expression)
{
IQuery query;
NhLinqExpression nhLinqExpression = PrepareQuery(expression, out query);
NhLinqExpression nhLinqExpression = PrepareQuery(expression, out var query);

return ExecuteQuery(nhLinqExpression, query, nhLinqExpression);
return ExecuteQuery(nhLinqExpression, query);
}

public TResult Execute<TResult>(Expression expression)
Expand Down Expand Up @@ -153,7 +152,7 @@ public virtual Task<object> ExecuteAsync(Expression expression, CancellationToke
try
{
var nhLinqExpression = PrepareQuery(expression, out var query);
return ExecuteQueryAsync(nhLinqExpression, query, nhLinqExpression, cancellationToken);
return ExecuteQueryAsync(nhLinqExpression, query, cancellationToken);
}
catch (Exception ex)
{
Expand Down Expand Up @@ -181,6 +180,8 @@ protected virtual NhLinqExpression PrepareQuery(Expression expression, out IQuer
return nhLinqExpression;
}

// Since v5.1
[Obsolete("Use ExecuteQuery(NhLinqExpression nhLinqExpression, IQuery query) instead")]
protected virtual object ExecuteQuery(NhLinqExpression nhLinqExpression, IQuery query, NhLinqExpression nhQuery)
{
IList results = query.List();
Expand All @@ -205,6 +206,14 @@ protected virtual object ExecuteQuery(NhLinqExpression nhLinqExpression, IQuery
return results[0];
}

protected virtual object ExecuteQuery(NhLinqExpression nhLinqExpression, IQuery query)
{
// For avoiding breaking derived classes, call the obsolete method until it is dropped.
#pragma warning disable 618
return ExecuteQuery(nhLinqExpression, query, nhLinqExpression);
#pragma warning restore 618
}

private static void SetParameters(IQuery query, IDictionary<string, Tuple<object, IType>> parameters)
{
foreach (var parameterName in query.NamedParameters)
Expand Down