No Obsolete constructors or methods usage

+ StorageDriver.Compile(ISqlCompileUnit, NodeConfiguration) marked obsolete

Author: alex-kulakov

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

@@ -41,9 +41,7 @@ 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;
     }

Orm/Xtensive.Orm/Orm/Providers/Requests/QueryRequest.cs

@@ -42,9 +42,7 @@ public void Prepare()
     {
       if (compiledStatement!=null && accessor!=null)
         return;
-      compiledStatement = (NodeConfiguration!=null)
-        ? driver.Compile(Statement, NodeConfiguration)
-        : driver.Compile(Statement);
+      compiledStatement = driver.Compile(Statement);
       accessor = driver.GetDataReaderAccessor(TupleDescriptor);
       Statement = null;
     }

Orm/Xtensive.Orm/Orm/Providers/SequenceQueryBuilder.cs

@@ -29,76 +29,51 @@ public SequenceQuery BuildNextValueQuery(SchemaNode generatorNode, NodeConfigura
         ? SequenceQueryCompartment.SameSession
         : compartment;
 
-      var postCompilerConfiguration = (nodeConfiguration != null)
-        ? new SqlPostCompilerConfiguration(nodeConfiguration.GetDatabaseMapping(), nodeConfiguration.GetSchemaMapping())
-        : new SqlPostCompilerConfiguration();
+      var postCompilerConfiguration = GetPostCompilerConfig(nodeConfiguration);
 
       var sqlNext = hasSequences
         ? GetSequenceBasedNextImplementation(generatorNode, increment)
         : GetTableBasedNextImplementation(generatorNode);
 
-      var requiresSeparateSession = !hasSequences;
-      var batch = sqlNext as SqlBatch;
-      if (batch == null || hasBatches)
+      if (sqlNext is not SqlBatch batch || hasBatches) {
         // There are batches or there is single statement, so we can run this as a single request
-        return new SequenceQuery(Compile(sqlNext, nodeConfiguration).GetCommandText(postCompilerConfiguration), actualCompartment);
-
-      // No batches, so we must execute this manually
-      if (!storesAutoIncrementSettingsInMemory)
-        return new SequenceQuery(
-          Compile((ISqlCompileUnit)batch[0], nodeConfiguration).GetCommandText(postCompilerConfiguration),
-          Compile((ISqlCompileUnit)batch[1], nodeConfiguration).GetCommandText(postCompilerConfiguration),
-          actualCompartment);
-      return new SequenceQuery(
-          Compile((ISqlCompileUnit)batch[0], nodeConfiguration).GetCommandText(postCompilerConfiguration),
-          Compile((ISqlCompileUnit)batch[1], nodeConfiguration).GetCommandText(postCompilerConfiguration),
-          Compile((ISqlCompileUnit)batch[2], nodeConfiguration).GetCommandText(postCompilerConfiguration),
-          actualCompartment);
-    }
-
-    public SequenceQuery BuildNextValueQuery(SchemaNode generatorNode, NodeConfiguration nodeConfiguration, long increment)
-    {
-      return BuildNextValueQuery(generatorNode, nodeConfiguration, increment, false);
+        return new SequenceQuery(driver.Compile(sqlNext).GetCommandText(postCompilerConfiguration), actualCompartment);
+      }
+      else {
+        // No batches, so we must execute this manually
+        return !storesAutoIncrementSettingsInMemory
+          ? new SequenceQuery(
+              driver.Compile((ISqlCompileUnit) batch[0]).GetCommandText(postCompilerConfiguration),
+              driver.Compile((ISqlCompileUnit) batch[1]).GetCommandText(postCompilerConfiguration),
+              actualCompartment)
+          : new SequenceQuery(
+              driver.Compile((ISqlCompileUnit) batch[0]).GetCommandText(postCompilerConfiguration),
+              driver.Compile((ISqlCompileUnit) batch[1]).GetCommandText(postCompilerConfiguration),
+              driver.Compile((ISqlCompileUnit) batch[2]).GetCommandText(postCompilerConfiguration),
+              actualCompartment);
+      }
     }
 
-    public SequenceQuery BuildNextValueQuery(SchemaNode generatorNode, long increment, bool forcedSameSessionExecution)
-    {
-      return BuildNextValueQuery(generatorNode, null, increment, forcedSameSessionExecution);
-    }
+    public SequenceQuery BuildNextValueQuery(SchemaNode generatorNode, long increment, bool forcedSameSessionExecution) =>
+      BuildNextValueQuery(generatorNode, null, increment, forcedSameSessionExecution);
 
-    public SequenceQuery BuildNextValueQuery(SchemaNode generatorNode, long increment)
-    {
-      return BuildNextValueQuery(generatorNode, null, increment);
-    }
+    public SequenceQuery BuildNextValueQuery(SchemaNode generatorNode, long increment) =>
+      BuildNextValueQuery(generatorNode, null, increment, false);
 
-    public string BuildCleanUpQuery(SchemaNode generatorNode)
-    {
-      return BuildCleanUpQuery(generatorNode, null);
-    }
+    public string BuildCleanUpQuery(SchemaNode generatorNode) =>
+      BuildCleanUpQuery(generatorNode, null);
 
     public string BuildCleanUpQuery(SchemaNode generatorNode, NodeConfiguration nodeConfiguration)
     {
-      var postCompilerConfiguration = (nodeConfiguration != null)
-        ? new SqlPostCompilerConfiguration(nodeConfiguration.GetDatabaseMapping(), nodeConfiguration.GetSchemaMapping())
-        : new SqlPostCompilerConfiguration();
+      var postCompilerConfiguration = GetPostCompilerConfig(nodeConfiguration);
 
-      var table = (Table)generatorNode;
+      var table = (Table) generatorNode;
       var delete = SqlDml.Delete(SqlDml.TableRef(table));
-      return Compile(delete, nodeConfiguration).GetCommandText(postCompilerConfiguration);
-    }
-
-
-    private SqlCompilationResult Compile(ISqlCompileUnit unit, NodeConfiguration nodeConfiguration)
-    {
-      if (nodeConfiguration!=null)
-        return driver.Compile(unit, nodeConfiguration);
-      return driver.Compile(unit);
+      return driver.Compile(delete).GetCommandText(postCompilerConfiguration);
     }
 
-    private ISqlCompileUnit GetSequenceBasedNextImplementation(SchemaNode generatorNode, long increment)
-    {
-      return SqlDml.Select(SqlDml.NextValue((Sequence) generatorNode, (int) increment));
-    }
+    private ISqlCompileUnit GetSequenceBasedNextImplementation(SchemaNode generatorNode, long increment) =>
+      SqlDml.Select(SqlDml.NextValue((Sequence) generatorNode, (int) increment));
 
     private ISqlCompileUnit GetTableBasedNextImplementation(SchemaNode generatorNode)
     {
@@ -116,20 +91,26 @@ private ISqlCompileUnit GetTableBasedNextImplementation(SchemaNode generatorNode
       }
 
       var result = SqlDml.Batch();
-      if (storesAutoIncrementSettingsInMemory)
+      if (storesAutoIncrementSettingsInMemory) {
         result.Add(delete);
+      }
       result.Add(insert);
       result.Add(SqlDml.Select(SqlDml.LastAutoGeneratedId()));
       return result;
     }
 
+    private static SqlPostCompilerConfiguration GetPostCompilerConfig(NodeConfiguration nodeConfiguration) =>
+  (nodeConfiguration != null)
+    ? new SqlPostCompilerConfiguration(nodeConfiguration.GetDatabaseMapping(), nodeConfiguration.GetSchemaMapping())
+    : new SqlPostCompilerConfiguration();
+
     private static TableColumn GetColumn(Table table, string columnName)
     {
       var idColumn = table.TableColumns[columnName];
-      if (idColumn==null)
-        throw new InvalidOperationException(string.Format(
-          Strings.ExColumnXIsNotFoundInTableY, columnName, table.Name));
-      return idColumn;
+      return idColumn == null
+        ? throw new InvalidOperationException(string.Format(
+            Strings.ExColumnXIsNotFoundInTableY, columnName, table.Name))
+        : idColumn;
     }
 
     public SequenceQueryBuilder(StorageDriver driver)

Orm/Xtensive.Orm/Orm/Providers/SqlCompiler.Index.cs

@@ -61,7 +61,7 @@ private SqlSelect BuildTableQuery(IndexInfo index)
       var atRootPolicy = false;
 
       if (table==null) {
-        table = Mapping[index.ReflectedType.GetRoot()];
+        table = Mapping[index.ReflectedType.Root];
         atRootPolicy = true;
       }
 
@@ -76,7 +76,7 @@ private SqlSelect BuildTableQuery(IndexInfo index)
         }
       }
       else {
-        var root = index.ReflectedType.GetRoot().AffectedIndexes.First(i => i.IsPrimary);
+        var root = index.ReflectedType.Root.AffectedIndexes.First(i => i.IsPrimary);
         var lookup = root.Columns.ToDictionary(c => c.Field, c => c.Name);
         foreach (var c in indexColumns) {
           queryColumns.Add(tableRef[lookup[c.Field]]);

Orm/Xtensive.Orm/Orm/Providers/SqlExecutor.cs

@@ -252,7 +252,7 @@ private string Compile(ISqlCompileUnit statement)
       var upgradeContext = UpgradeContext.GetCurrent(session.Domain.UpgradeContextCookie);
       var nodeConfiguration = upgradeContext != null ? upgradeContext.NodeConfiguration : session.StorageNode.Configuration;
 
-      return driver.Compile(statement, nodeConfiguration)
+      return driver.Compile(statement)
         .GetCommandText(
           new SqlPostCompilerConfiguration(nodeConfiguration.GetDatabaseMapping(), nodeConfiguration.GetSchemaMapping()));
     }

Orm/Xtensive.Orm/Orm/Providers/StorageDriver.cs

@@ -88,9 +88,8 @@ public SqlCompilationResult Compile(ISqlCompileUnit statement)
       return underlyingDriver.Compile(statement, options);
     }
 
-#pragma warning disable IDE0060 // Remove unused parameter
+    [Obsolete]
     public SqlCompilationResult Compile(ISqlCompileUnit statement, NodeConfiguration nodeConfiguration)
-#pragma warning restore IDE0060 // Remove unused parameter
     {
       var options = new SqlCompilerConfiguration {
         DatabaseQualifiedObjects = configuration.IsMultidatabase,

Orm/Xtensive.Orm/Orm/Services/QueryBuilding/QueryBuilder.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2020 Xtensive LLC.
+// Copyright (C) 2012-2022 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Denis Krjuchkov
@@ -60,10 +60,7 @@ public QueryTranslationResult TranslateQuery<TResult>(IQueryable<TResult> query)
     public SqlCompilationResult CompileQuery(ISqlCompileUnit query)
     {
       ArgumentValidator.EnsureArgumentNotNull(query, "query");
-      var upgradeContext = UpgradeContext.GetCurrent(Session.Domain.UpgradeContextCookie);
-      if (upgradeContext!=null)
-        return driver.Compile(query, upgradeContext.NodeConfiguration);
-      return driver.Compile(query, Session.StorageNode.Configuration);
+      return driver.Compile(query);
     }
 
     /// <summary>

Orm/Xtensive.Orm/Sql/Compiler/SqlCompilerConfiguration.cs

@@ -61,10 +61,10 @@ public SqlCompilerConfiguration Clone()
 
     public SqlCompilerConfiguration()
     {
-#pragma warning disable CS0612 // Type or member is obsolete
+#pragma warning disable CS0618 // Type or member is obsolete
       SchemaMapping = null;
       DatabaseMapping = null;
-#pragma warning restore CS0612 // Type or member is obsolete
+#pragma warning restore CS0618 // Type or member is obsolete
     }
 
     [Obsolete]