Merge pull request #174 from servicetitan/mergeUpstream

Merge upstream

Author: SergeiPavlov

ChangeLog/7.2.0-Beta-1-dev.txt

@@ -6,6 +6,10 @@
 [main] DomainConfiguration.MaxNumberOfConditions is introduced
 [main] SqlDml.Truncate() is introduced.
 [main] WellKnown.MaxNumberOfConditions became obsolete, use new DomainConfiguration.MaxNumberOfConditions if needed
+[main] TypeHelper.GetSingleConstructor() and .GetSingleConstructorOrDefault() are marked obsolete
+[main] Session.DisableSaveChages() methods return null value in more cases. See methods' summaries
+[main] DirectSessionAccessor.OpenSystemLogicOnlyRegion() returns disposable struct instead of IDisposable
+[main] OperationRegistry's Disable/EnableSystemOperationRegistration methods return disposable struct instead of IDisposable
 [main] Temporary tables cleanup now uses TRUNCATE instead of DELETE when possible
 [main] Temporary tables population is increased with multi-row inserts - 256 and 16 items per INSERT
 [main] PersistParameterBinding has new field RowIndex, use it for multi-row inserts if needed

Orm/Xtensive.Orm/IoC/ServiceContainer.cs

@@ -227,11 +227,13 @@ public static IServiceContainer Create(Type containerType, object configuration,
     private static ConstructorInvoker FindConstructorInvoker(Type containerType, params Type[] argumentTypes) =>
       containerType.GetSingleConstructorInvokerOrDefault(argumentTypes);
 #else
+#pragma warning disable CS0612 // Type or member is obsolete
     private static ConstructorInfo FindConstructor(Type containerType, params Type[] argumentTypes) =>
       containerType.GetSingleConstructorOrDefault(argumentTypes);
+#pragma warning restore CS0612 // Type or member is obsolete
 #endif
 
-#endregion
+    #endregion
 
     /// <summary>
     /// Creates <see cref="IServiceContainer"/> by default configuration.

Orm/Xtensive.Orm/Orm/Operations/OperationRegistry.cs

@@ -21,7 +21,7 @@ public sealed class OperationRegistry
       private readonly OperationRegistry registry;
       private readonly bool prevIsSystemOperationRegistrationEnabled;
 
-      public SystemOperationRegistrationScope(OperationRegistry registry, bool enable)
+      internal SystemOperationRegistrationScope(OperationRegistry registry, bool enable)
       {
         this.registry = registry;
         prevIsSystemOperationRegistrationEnabled = registry.IsSystemOperationRegistrationEnabled;
@@ -32,9 +32,9 @@ public SystemOperationRegistrationScope(OperationRegistry registry, bool enable)
     }
 
     private readonly ICompletableScope blockingScope;
+    private readonly Collections.Deque<ICompletableScope> scopes = new();
     private bool isOperationRegistrationEnabled = true;
     private bool isUndoOperationRegistrationEnabled = true;
-    private Collections.Deque<ICompletableScope> scopes = new Collections.Deque<ICompletableScope>();
 
     /// <summary>
     /// Gets the session this instance is bound to.

Orm/Xtensive.Orm/Orm/Session.Persist.cs

@@ -229,7 +229,7 @@ private async ValueTask Persist(PersistReason reason, bool isAsync, Cancellation
     }
 
     /// <summary>
-    /// Temporarily disables all save changes operations (both explicit ant automatic) 
+    /// Temporarily disables all save changes operations (both explicit ant automatic)
     /// for specified <paramref name="target"/>.
     /// Such entity is prevented from being persisted to the database,
     /// when <see cref="SaveChanges"/> is called or query is executed.
@@ -239,34 +239,37 @@ private async ValueTask Persist(PersistReason reason, bool isAsync, Cancellation
     /// all entities that reference <paramref name="target"/> are also pinned automatically.
     /// </summary>
     /// <param name="target">The entity to disable persisting.</param>
-    /// <returns>A special object that controls lifetime of such behavior if <paramref name="target"/> was not previously processed by the method,
-    /// otherwise <see langword="null"/>.</returns>
+    /// <returns>
+    /// A special object that controls lifetime of such behavior if <paramref name="target"/> was not previously processed by the method
+    /// and automatic saving of changes is enabled (<see cref="SessionOptions.AutoSaveChanges"/>),
+    /// otherwise <see langword="null"/>.
+    /// </returns>
     public IDisposable DisableSaveChanges(IEntity target)
     {
       EnsureNotDisposed();
       ArgumentValidator.EnsureArgumentNotNull(target, "target");
+      if (!Configuration.Supports(SessionOptions.AutoSaveChanges))
+        return null; // No need to pin in this case
+
       var targetEntity = (Entity) target;
       targetEntity.EnsureNotRemoved();
-      return Configuration.Supports(SessionOptions.AutoSaveChanges)
-        ? pinner.RegisterRoot(targetEntity.State)
-        : EmptyDisposable; // No need to pin in this case
+      return pinner.RegisterRoot(targetEntity.State);
     }
 
     /// <summary>
     /// Temporarily disables only automatic save changes operations before queries, etc.
     /// Explicit call of <see cref="SaveChanges"/> will lead to flush changes anyway.
     /// If save changes is to be performed due to starting a nested transaction or committing a transaction,
     /// active disabling save changes scope will lead to failure.
-    /// <returns>A special object that controls lifetime of such behavior if there is no active scope,
+    /// <returns>A special object that controls lifetime of such behavior if there is no active scope
+    /// and automatic saving of changes is enabled (<see cref="SessionOptions.AutoSaveChanges"/>),
     /// otherwise <see langword="null"/>.</returns>
     /// </summary>
     public IDisposable DisableSaveChanges()
     {
-      if (!Configuration.Supports(SessionOptions.AutoSaveChanges)) {
-        return EmptyDisposable; // No need to pin in this case
+      if (!Configuration.Supports(SessionOptions.AutoSaveChanges) || disableAutoSaveChanges) {
+        return null; // No need to pin in these cases
       }
-      if (disableAutoSaveChanges)
-        return null;
 
       disableAutoSaveChanges = true;
       return new Disposable(_ => {
@@ -323,7 +326,7 @@ private void CancelEntitiesChanges()
         newEntity.Update(null);
         newEntity.PersistenceState = PersistenceState.Removed;
       }
-      
+
       foreach (var modifiedEntity in EntityChangeRegistry.GetItems(PersistenceState.Modified)) {
         modifiedEntity.RollbackDifference();
         modifiedEntity.PersistenceState = PersistenceState.Synchronized;

Orm/Xtensive.Orm/Orm/Session.SystemLogic.cs

@@ -16,7 +16,7 @@ public partial class Session
       private readonly Session session;
       private readonly bool prevIsSystemLogicOnly;
 
-      public SystemLogicOnlyRegionScope(Session session)
+      internal SystemLogicOnlyRegionScope(Session session)
       {
         this.session = session;
         prevIsSystemLogicOnly = session.IsSystemLogicOnly;