Merge branch '6.0'

# Conflicts:
#	Extensions/Xtensive.Orm.BulkOperations/Internals/BulkDeleteOperation.cs
#	Extensions/Xtensive.Orm.BulkOperations/Internals/BulkUpdateOperation.cs
#	Extensions/Xtensive.Orm.BulkOperations/Internals/InsertOperation.cs
#	Extensions/Xtensive.Orm.BulkOperations/Internals/Operation.cs
#	Orm/Xtensive.Orm.Tests/Storage/QueryBuilderTest.cs
#	Orm/Xtensive.Orm/Orm/Services/QueryBuilding/QueryCommand.cs

Author: alex-kulakov

ChangeLog/6.0.3_Z_Final.txt

@@ -1,5 +1,6 @@
 [main] Provider for MS SQL Server was branched out into a separate project
 [main] Events for changes cancelling ported from 5.0.x
+[main] QueryCommand now implements IDisposable interface
 [main] TupleDescriptor no longer implements IList<T>
 [main] TupleDescriptor.GetCommonPartLength(TupleDescriptor) method was removed
 [main] TupleDescriptor.IsValueType(int) method was removed

Extensions/Xtensive.Orm.BulkOperations/Internals/BulkDeleteOperation.cs

@@ -1,4 +1,7 @@
-
+// Copyright (C) 2019-2020 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
+
 using System;
 using System.Linq;
 using System.Threading;
@@ -22,12 +25,12 @@ protected override int ExecuteInternal()
         throw new NotImplementedException("Inheritance is not implemented");
       }
 
-      base.ExecuteInternal();
+      _ = base.ExecuteInternal();
 
       var request = GetRequest(query);
       Bindings = request.ParameterBindings.ToList();
 
-      var command = CreateCommand(request);
+      using var command = CreateCommand(request);
       return command.ExecuteNonQuery();
     }
 
@@ -103,4 +106,4 @@ public BulkDeleteOperation(IQueryable<T> query)
       this.query = query;
     }
   }
-}
+}

Extensions/Xtensive.Orm.BulkOperations/Internals/BulkUpdateOperation.cs

@@ -30,11 +30,11 @@ protected override int ExecuteInternal()
         throw new NotImplementedException("Inheritance is not implemented");
       }
 
-      base.ExecuteInternal();
+      _ = base.ExecuteInternal();
       var request = GetRequest(query);
       Bindings = request.ParameterBindings.ToList();
 
-      var command = CreateCommand(request);
+      using var command = CreateCommand(request);
       return command.ExecuteNonQuery();
     }
 
@@ -157,4 +157,4 @@ public BulkUpdateOperation(IUpdatable<T> query)
       setOperation=new SetOperation<T>(this, descriptors);
     }
   }
-}
+}

Extensions/Xtensive.Orm.BulkOperations/Internals/InsertOperation.cs

@@ -28,7 +28,7 @@ protected override int ExecuteInternal()
       }
       Bindings = new List<QueryParameterBinding>();
 
-      var command = CreateCommand();
+      using var command = CreateCommand();
       return command.ExecuteNonQuery();
     }
 
@@ -119,4 +119,4 @@ private void AddKey(List<SetDescriptor> descriptors)
 
     public Key Key { get; private set; }
   }
-}
+}

Extensions/Xtensive.Orm.BulkOperations/Internals/Operation.cs

@@ -88,4 +88,4 @@ protected Operation(QueryProvider queryProvider)
       QueryBuilder = Session.Services.Get<QueryBuilder>();
     }
   }
-}
+}

Orm/Xtensive.Orm.Tests/Issues/IssueJira0571_MySqlKeyGenerationProblem.cs

@@ -1,6 +1,6 @@
-// Copyright (C) 2014 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2015-2020 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Alexey Kulakov
 // Created:    2015.02.03
 
@@ -138,7 +138,8 @@ private void CheckSchemaGenerators(Schema schema, string generatorName, Session
       var query = GetQuery(generatorTable);
       var queryBuilder = GetQueryBuilder(session);
       var queryCompilationResult = queryBuilder.CompileQuery(query);
-      var command = queryBuilder.CreateCommand(queryBuilder.CreateRequest(queryCompilationResult, Enumerable.Empty<Services.QueryParameterBinding>()));
+      var queryRequest = queryBuilder.CreateRequest(queryCompilationResult, Enumerable.Empty<Services.QueryParameterBinding>());
+      using var command = queryBuilder.CreateCommand(queryRequest);
       var rowCount = command.ExecuteScalar();
       Assert.AreEqual(expectedValue, rowCount);
     }

Orm/Xtensive.Orm.Tests/Storage/QueryBuilderTest.cs

@@ -68,8 +68,10 @@ public void ModifyQueryTest()
         var command = builder.CreateCommand(request);
         Assert.That(command, Is.Not.Null);
 
-        var result = Convert.ToInt32(command.ExecuteScalar());
-        Assert.That(result, Is.EqualTo(1));
+        using (command) {
+          var result = Convert.ToInt32(command.ExecuteScalar());
+          Assert.That(result, Is.EqualTo(1));
+        }
 
         tx.Complete();
       }
@@ -89,17 +91,19 @@ public void ComposeQuery()
         var compiled = builder.CompileQuery(select);
         Assert.That(compiled, Is.Not.Null);
 
-        var request = builder.CreateRequest(compiled, new[] {binding});
+        var request = builder.CreateRequest(compiled, new[] { binding });
         Assert.That(request, Is.Not.Null);
 
         var command = builder.CreateCommand(request);
         Assert.That(command, Is.Not.Null);
 
-        var result = Convert.ToInt32(command.ExecuteScalar());
-        Assert.That(result, Is.EqualTo(43));
+        using (command) {
+          var result = Convert.ToInt32(command.ExecuteScalar());
+          Assert.That(result, Is.EqualTo(43));
+        }
 
         tx.Complete();
       }
     }
   }
-}
+}

Orm/Xtensive.Orm.Tests/Upgrade/SchemaSharing/QueryBuilder/Model.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2017 Xtensive LLC.
+// Copyright (C) 2017 Xtensive LLC.
 // All rights reserved.
 // For conditions of distribution and use, see license.
 // Created by: Alexey Kulakov
@@ -316,8 +316,7 @@ private object ExecuteScalar(Services.QueryBuilder queryBuilder, ISqlCompileUnit
     {
       var commandtext = queryBuilder.CompileQuery(query);
       var request = queryBuilder.CreateRequest(commandtext, Enumerable.Empty<Services.QueryParameterBinding>());
-      var command = queryBuilder.CreateCommand(request);
-
+      using var command = queryBuilder.CreateCommand(request);
       return command.ExecuteScalar();
     }
 

Orm/Xtensive.Orm/Orm/Services/QueryBuilding/QueryCommand.cs

@@ -4,7 +4,9 @@
 // Created by: Denis Krjuchkov
 // Created:    2012.02.27
 
+using System;
 using System.Data.Common;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Xtensive.Orm.Providers;
@@ -16,23 +18,35 @@ namespace Xtensive.Orm.Services
   /// Unlike <see cref="DbCommand"/> this type is aware of <see cref="Session.Events"/>
   /// and does all necessary logging of executed SQL.
   /// </summary>
-  public sealed class QueryCommand
+  public sealed class QueryCommand : IDisposable
   {
     private readonly StorageDriver driver;
     private readonly Session session;
     private readonly DbCommand realCommand;
 
+    private bool disposed;
+
     /// <summary>
     /// Gets SQL query to execute.
     /// </summary>
-    public string CommandText => realCommand.CommandText;
+    public string CommandText
+    {
+      get {
+        EnsureNotDisposed();
+        return realCommand.CommandText;
+      }
+    }
 
     /// <summary>
     /// Executes query and returns <see cref="DbDataReader"/>
     /// for retrieving query results.
     /// </summary>
     /// <returns><see cref="DbDataReader"/> to use.</returns>
-    public DbDataReader ExecuteReader() => driver.ExecuteReader(session, realCommand);
+    public DbDataReader ExecuteReader()
+    {
+      EnsureNotDisposed();
+      return driver.ExecuteReader(session, realCommand);
+    }
 
     /// <summary>
     /// Executes query and returns <see cref="DbDataReader"/>
@@ -49,7 +63,11 @@ public Task<DbDataReader> ExecuteReaderAsync(CancellationToken token = default)
     /// Executes query and returns number of affected rows.
     /// </summary>
     /// <returns>Number of affected rows.</returns>
-    public int ExecuteNonQuery() => driver.ExecuteNonQuery(session, realCommand);
+    public int ExecuteNonQuery()
+    {
+      EnsureNotDisposed();
+      return driver.ExecuteNonQuery(session, realCommand);
+    }
 
     /// <summary>
     /// Asynchronously executes query and returns number of affected rows.
@@ -65,7 +83,11 @@ public Task<int> ExecuteNonQueryAsync(CancellationToken token = default) =>
     /// Executes query and returns scalar result.
     /// </summary>
     /// <returns>Scalar result of query.</returns>
-    public object ExecuteScalar() => driver.ExecuteScalar(session, realCommand);
+    public object ExecuteScalar()
+    {
+      EnsureNotDisposed();
+      return driver.ExecuteScalar(session, realCommand);
+    }
 
     /// <summary>
     /// Asynchronously executes query and returns scalar result.
@@ -77,6 +99,24 @@ public Task<int> ExecuteNonQueryAsync(CancellationToken token = default) =>
     public Task<object> ExecuteScalarAsync(CancellationToken token = default) =>
       driver.ExecuteScalarAsync(session, realCommand, token);
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private void EnsureNotDisposed()
+    {
+      if (disposed) {
+        throw new ObjectDisposedException(null);
+      }
+    }
+
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+      if (disposed) {
+        return;
+      }
+      disposed = true;
+      realCommand?.Dispose();
+    }
+
     // Constructors
 
     internal QueryCommand(StorageDriver driver, Session session, DbCommand realCommand)
@@ -86,4 +126,4 @@ internal QueryCommand(StorageDriver driver, Session session, DbCommand realComma
       this.realCommand = realCommand;
     }
   }
-}
+}