Merge pull request #146 from DataObjects-NET/6.0-infinite-loop-on-batching

Fixes possible infinite loop on command batching

Author: alex-kulakov

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

@@ -192,7 +192,7 @@ public void InlineQueryInSeparateBatchTest()
           q.All<ALotOfFieldsEntityValid>().Where(e => e.Id.In(IncludeAlgorithm.ComplexCondition, ids))));
 
         var inlineQuery = session.Query.All<ALotOfFieldsEntityValid>()
-          .Where(e => e.Id.In(IncludeAlgorithm.ComplexCondition, new[] { 1, 2 }));
+          .Where(e => e.Id.In(IncludeAlgorithm.ComplexCondition, new[] { 1, 2, 3, 4 }));
 
         using (counter.Attach()) {
           Assert.That(inlineQuery.Any(), Is.True);
@@ -246,7 +246,7 @@ public async Task InlineQueryInSeparateBatchAsyncTest()
 
         using (counter.Attach()) {
           var inlineQuery = await session.Query.All<ALotOfFieldsEntityValid>()
-          .Where(e => e.Id.In(IncludeAlgorithm.ComplexCondition, new[] { 1, 2 })).AsAsync();
+          .Where(e => e.Id.In(IncludeAlgorithm.ComplexCondition, new[] { 1, 2, 3, 4 })).AsAsync();
           Assert.That(inlineQuery.Any(), Is.True);
           Assert.That(counter.Count, Is.EqualTo(6));
         }

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

@@ -131,7 +131,7 @@ protected ExecutionBehavior GetCommandExecutionBehavior(ICollection<CommandPart>
         }
         sum += count;
       }
-      if (sum + currentParametersCount < MaxQueryParameterCount) {
+      if (sum + currentParametersCount <= MaxQueryParameterCount) {
         return ExecutionBehavior.AsOneCommand;
       }
       return sum < MaxQueryParameterCount