Skip to content

Commit ef5526c

Browse files
committed
Merge branch '6.0'
# Conflicts: # Orm/Xtensive.Orm.Tests/Storage/CommandProcessing/BatchingCommandProcessorParametersManagement.cs
2 parents 31902fe + 04804b8 commit ef5526c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Orm/Xtensive.Orm.Tests/Storage/CommandProcessing/BatchingCommandProcessorParametersManagement.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public void InlineQueryInSeparateBatchTest()
192192
q.All<ALotOfFieldsEntityValid>().Where(e => e.Id.In(IncludeAlgorithm.ComplexCondition, ids))));
193193

194194
var inlineQuery = session.Query.All<ALotOfFieldsEntityValid>()
195-
.Where(e => e.Id.In(IncludeAlgorithm.ComplexCondition, new[] { 1, 2 }));
195+
.Where(e => e.Id.In(IncludeAlgorithm.ComplexCondition, new[] { 1, 2, 3, 4 }));
196196

197197
using (counter.Attach()) {
198198
Assert.That(inlineQuery.Any(), Is.True);
@@ -246,7 +246,7 @@ public async Task InlineQueryInSeparateBatchAsyncTest()
246246

247247
using (counter.Attach()) {
248248
var inlineQuery = await session.Query.All<ALotOfFieldsEntityValid>()
249-
.Where(e => e.Id.In(IncludeAlgorithm.ComplexCondition, new[] { 1, 2 })).ExecuteAsync();
249+
.Where(e => e.Id.In(IncludeAlgorithm.ComplexCondition, new[] { 1, 2, 3, 4 })).AsAsync();
250250
Assert.That(inlineQuery.Any(), Is.True);
251251
Assert.That(counter.Count, Is.EqualTo(6));
252252
}

Orm/Xtensive.Orm/Orm/Providers/CommandProcessing/CommandProcessor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ protected ExecutionBehavior GetCommandExecutionBehavior(ICollection<CommandPart>
138138
}
139139
sum += count;
140140
}
141-
if (sum + currentParametersCount < MaxQueryParameterCount) {
141+
if (sum + currentParametersCount <= MaxQueryParameterCount) {
142142
return ExecutionBehavior.AsOneCommand;
143143
}
144144
return sum < MaxQueryParameterCount

0 commit comments

Comments
 (0)