Merge branch '7.1'

# Conflicts:
#	Orm/Xtensive.Orm/Orm/Providers/Requests/PersistRequest.cs

Author: alex-kulakov

Orm/Xtensive.Orm/Orm/Providers/Requests/PersistRequest.cs

@@ -28,18 +28,14 @@ public sealed class PersistRequest
 
     public IReadOnlyCollection<PersistParameterBinding> ParameterBindings { get; }
 
-    internal NodeConfiguration NodeConfiguration { get; }
-
     public SqlCompilationResult GetCompiledStatement() =>
       compiledStatement ?? throw new InvalidOperationException(Strings.ExRequestIsNotPrepared);
 
     public void Prepare()
     {
       if (compiledStatement != null)
         return;
-      compiledStatement = (NodeConfiguration != null)
-        ? driver.Compile(CompileUnit, NodeConfiguration)
-        : driver.Compile(CompileUnit);
+      compiledStatement = driver.Compile(CompileUnit);
       CompileUnit = null;
       Statement = null;
     }
@@ -48,10 +44,20 @@ public void Prepare()
 
     public PersistRequest(
       StorageDriver driver, SqlStatement statement, IEnumerable<PersistParameterBinding> parameterBindings)
-      : this(driver, statement, parameterBindings, null)
     {
+      ArgumentValidator.EnsureArgumentNotNull(driver, "driver");
+      ArgumentValidator.EnsureArgumentNotNull(statement, "statement");
+
+      var compileUnit = statement as ISqlCompileUnit
+        ?? throw new ArgumentException("Statement is not ISqlCompileUnit");
+
+      this.driver = driver;
+      Statement = statement;
+      CompileUnit = compileUnit;
+      ParameterBindings = ParameterBinding.NormalizeBindings(parameterBindings);
     }
 
+    [Obsolete]
     public PersistRequest(
       StorageDriver driver, SqlStatement statement, IEnumerable<PersistParameterBinding> parameterBindings, NodeConfiguration nodeConfiguration)
     {
@@ -65,7 +71,6 @@ public PersistRequest(
       Statement = statement;
       CompileUnit = compileUnit;
       ParameterBindings = ParameterBinding.NormalizeBindings(parameterBindings);
-      NodeConfiguration = nodeConfiguration;
     }
   }
 }

Orm/Xtensive.Orm/Orm/Providers/Requests/PersistRequestBuilder.cs

@@ -50,7 +50,7 @@ internal ICollection<PersistRequest> Build(StorageNode node, PersistRequestBuild
           batch.Add(request.Statement);
           bindings.UnionWith(request.ParameterBindings);
         }
-        var batchRequest = CreatePersistRequest(batch, bindings, node.Configuration);
+        var batchRequest = new PersistRequest(driver, batch, bindings);
         batchRequest.Prepare();
         return new List<PersistRequest> {batchRequest}.AsReadOnly();
       }
@@ -82,7 +82,7 @@ protected virtual List<PersistRequest> BuildInsertRequest(PersistRequestBuilderC
         }
         query.ValueRows.Add(row);
 
-        result.Add(CreatePersistRequest(query, bindings, context.NodeConfiguration));
+        result.Add(new PersistRequest(driver, query, bindings));
       }
       return result;
     }
@@ -123,7 +123,7 @@ protected virtual List<PersistRequest> BuildUpdateRequest(PersistRequestBuilderC
         if (requiresVersionValidation) {
           query.Where &= BuildVersionFilter(context, tableRef, bindings);
         }
-        result.Add(CreatePersistRequest(query, bindings,context.NodeConfiguration));
+        result.Add(new PersistRequest(driver, query, bindings));
       }
 
       return result;
@@ -141,7 +141,7 @@ protected virtual List<PersistRequest> BuildRemoveRequest(PersistRequestBuilderC
         if (context.Task.ValidateVersion) {
           query.Where &= BuildVersionFilter(context, tableRef, bindings);
         }
-        result.Add(CreatePersistRequest(query, bindings, context.NodeConfiguration));
+        result.Add(new PersistRequest(driver, query, bindings));
       }
       return result;
     }
@@ -192,6 +192,7 @@ private SqlExpression BuildVersionFilter(PersistRequestBuilderContext context, S
       return result;
     }
 
+    [Obsolete("Use constructor directly")]
     protected PersistRequest CreatePersistRequest(SqlStatement query, IEnumerable<PersistParameterBinding> bindings, NodeConfiguration nodeConfiguration)
     {
       return Handlers.Domain.Configuration.ShareStorageSchemaOverNodes