servicetitan · botinko · Aug 4, 2026
diff --git a/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/Connection.cs b/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/Connection.cs
@@ -243,20 +243,25 @@ private void OpenWithCheckAndNotification(string checkQueryString, DbConnectionA
       var connectionChecked = false;
       var restoreTriggered = false;
       var accessors = connectionAccessorEx.Accessors;
+      var session = NotificationSession;
       while (!connectionChecked) {
-        SqlHelper.NotifyConnectionOpening(accessors, UnderlyingConnection, (!connectionChecked && !restoreTriggered));
+        SqlHelper.NotifyConnectionOpening(
+          accessors, UnderlyingConnection, (!connectionChecked && !restoreTriggered), session);
         underlyingConnection.Open();
         try {
-          SqlHelper.NotifyConnectionInitializing(accessors, UnderlyingConnection, checkQueryString, (!connectionChecked && !restoreTriggered));
+          SqlHelper.NotifyConnectionInitializing(
+            accessors, UnderlyingConnection, checkQueryString, (!connectionChecked && !restoreTriggered), session);
           using (var command = underlyingConnection.CreateCommand()) {
             command.CommandText = checkQueryString;
             _ = command.ExecuteNonQuery();
           }
           connectionChecked = true;
-          SqlHelper.NotifyConnectionOpened(accessors, UnderlyingConnection, (!connectionChecked && !restoreTriggered));
+          SqlHelper.NotifyConnectionOpened(
+            accessors, UnderlyingConnection, (!connectionChecked && !restoreTriggered), session);
         }
         catch (Exception exception) {
-          SqlHelper.NotifyConnectionOpeningFailed(accessors, UnderlyingConnection, exception, (!connectionChecked && !restoreTriggered));
+          SqlHelper.NotifyConnectionOpeningFailed(
+            accessors, UnderlyingConnection, exception, (!connectionChecked && !restoreTriggered), session);
           if (InternalHelpers.ShouldRetryOn(exception)) {
             if (restoreTriggered) {
               throw;
@@ -311,17 +316,27 @@ private async Task OpenWithCheckAndNotificationAsync(string checkQueryString,
       var restoreTriggered = false;
       var accessors = connectionAccessorEx.Accessors;
 
+      var session = NotificationSession;
       while (!connectionChecked) {
         cancellationToken.ThrowIfCancellationRequested();
 
-        await SqlHelper.NotifyConnectionOpeningAsync(accessors,
-            UnderlyingConnection, (!connectionChecked && !restoreTriggered), cancellationToken)
+        await SqlHelper.NotifyConnectionOpeningAsync(
+            accessors,
+            UnderlyingConnection,
+            (!connectionChecked && !restoreTriggered),
+            cancellationToken,
+            session)
           .ConfigureAwaitFalse();
 
         await underlyingConnection.OpenAsync(cancellationToken).ConfigureAwaitFalse();
         try {
-          await SqlHelper.NotifyConnectionInitializingAsync(accessors,
-              UnderlyingConnection, checkQueryString, (!connectionChecked && !restoreTriggered), cancellationToken)
+          await SqlHelper.NotifyConnectionInitializingAsync(
+              accessors,
+              UnderlyingConnection,
+              checkQueryString,
+              (!connectionChecked && !restoreTriggered),
+              cancellationToken,
+              session)
             .ConfigureAwaitFalse();
 
           var command = underlyingConnection.CreateCommand();
@@ -330,12 +345,22 @@ await SqlHelper.NotifyConnectionInitializingAsync(accessors,
             _ = await command.ExecuteNonQueryAsync(cancellationToken).ConfigureAwaitFalse();
           }
           connectionChecked = true;
-          await SqlHelper.NotifyConnectionOpenedAsync(accessors, UnderlyingConnection, (!connectionChecked && !restoreTriggered), cancellationToken)
+          await SqlHelper.NotifyConnectionOpenedAsync(
+              accessors,
+              UnderlyingConnection,
+              (!connectionChecked && !restoreTriggered),
+              cancellationToken,
+              session)
             .ConfigureAwaitFalse();
         }
         catch (Exception exception) {
-          await SqlHelper.NotifyConnectionOpeningFailedAsync(accessors,
-              UnderlyingConnection, exception, (!connectionChecked && !restoreTriggered), cancellationToken)
+          await SqlHelper.NotifyConnectionOpeningFailedAsync(
+              accessors,
+              UnderlyingConnection,
+              exception,
+              (!connectionChecked && !restoreTriggered),
+              cancellationToken,
+              session)
             .ConfigureAwaitFalse();
 
           if (InternalHelpers.ShouldRetryOn(exception)) {

diff --git a/Orm/Xtensive.Orm.Tests/Storage/ConnectionAccessorTest.cs b/Orm/Xtensive.Orm.Tests/Storage/ConnectionAccessorTest.cs
@@ -26,16 +26,19 @@ public class MyConnectionAccessor : DbConnectionAccessor
     public int ConnectionInitializationCounter;
     public int ConnectionOpenedCounter;
     public int ConnectionOpeningFailedCounter;
+    public Session LastSession;
 
     public override void ConnectionOpening(ConnectionEventData eventData)
     {
       instanceMarker = UniqueInstanceIdentifier;
       ConnectionOpeningCounter++;
+      LastSession = eventData.Session;
     }
 
     public override void ConnectionInitialization(ConnectionInitEventData eventData)
     {
       ConnectionInitializationCounter++;
+      LastSession = eventData.Session;
       if (instanceMarker != UniqueInstanceIdentifier) {
         throw new Exception("Not the same instance");
       }
@@ -44,6 +47,7 @@ public override void ConnectionInitialization(ConnectionInitEventData eventData)
     public override void ConnectionOpened(ConnectionEventData eventData)
     {
       ConnectionOpenedCounter++;
+      LastSession = eventData.Session;
       if (instanceMarker != UniqueInstanceIdentifier) {
         throw new Exception("Not the same instance");
       }
@@ -52,6 +56,7 @@ public override void ConnectionOpened(ConnectionEventData eventData)
     public override void ConnectionOpeningFailed(ConnectionErrorEventData eventData)
     {
       ConnectionOpeningFailedCounter++;
+      LastSession = eventData.Session;
       if (instanceMarker != UniqueInstanceIdentifier) {
         throw new Exception("Not the same instance");
       }
@@ -209,6 +214,7 @@ public void SessionConnectionAccessorsTest()
         var accessorInstance = (MyConnectionAccessor) extension.Accessors.First();
         Assert.That(accessorInstance.ConnectionOpeningCounter, Is.Not.EqualTo(0));
         Assert.That(accessorInstance.ConnectionOpenedCounter, Is.Not.EqualTo(0));
+        Assert.That(accessorInstance.LastSession, Is.SameAs(session));
         first = accessorInstance.UniqueInstanceIdentifier;
       }
 
@@ -220,6 +226,7 @@ public void SessionConnectionAccessorsTest()
         var accessorInstance = (MyConnectionAccessor) extension.Accessors.First();
         Assert.That(accessorInstance.ConnectionOpeningCounter, Is.Not.EqualTo(0));
         Assert.That(accessorInstance.ConnectionOpenedCounter, Is.Not.EqualTo(0));
+        Assert.That(accessorInstance.LastSession, Is.SameAs(session));
         second = accessorInstance.UniqueInstanceIdentifier;
       }
 
@@ -242,6 +249,7 @@ public async Task SessionConnectionAccessorsAsyncTest()
         var accessorInstance = (MyConnectionAccessor) extension.Accessors.First();
         Assert.That(accessorInstance.ConnectionOpeningCounter, Is.Not.EqualTo(0));
         Assert.That(accessorInstance.ConnectionOpenedCounter, Is.Not.EqualTo(0));
+        Assert.That(accessorInstance.LastSession, Is.SameAs(session));
         first = accessorInstance.UniqueInstanceIdentifier;
       }
 
@@ -253,6 +261,7 @@ public async Task SessionConnectionAccessorsAsyncTest()
         var accessorInstance = (MyConnectionAccessor) extension.Accessors.First();
         Assert.That(accessorInstance.ConnectionOpeningCounter, Is.Not.EqualTo(0));
         Assert.That(accessorInstance.ConnectionOpenedCounter, Is.Not.EqualTo(0));
+        Assert.That(accessorInstance.LastSession, Is.SameAs(session));
         second = accessorInstance.UniqueInstanceIdentifier;
       }
 

diff --git a/Orm/Xtensive.Orm/Orm/ConnectionErrorEventData.cs b/Orm/Xtensive.Orm/Orm/ConnectionErrorEventData.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Data.Common;
-using Xtensive.Core;
 
 namespace Xtensive.Orm
 {
@@ -18,8 +17,12 @@ public class ConnectionErrorEventData : ConnectionEventData
     /// </summary>
     public Exception Exception { get; }
 
-    public ConnectionErrorEventData(Exception exception, DbConnection connection, bool reconnect = false)
-      : base(connection, reconnect)
+    public ConnectionErrorEventData(
+      Exception exception,
+      DbConnection connection,
+      bool reconnect = false,
+      Session session = null)
+      : base(connection, reconnect, session)
     {
       ArgumentNullException.ThrowIfNull(exception);
       Exception = exception;

diff --git a/Orm/Xtensive.Orm/Orm/ConnectionEventData.cs b/Orm/Xtensive.Orm/Orm/ConnectionEventData.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Data.Common;
-using Xtensive.Core;
 
 namespace Xtensive.Orm
 {
@@ -23,11 +22,19 @@ public class ConnectionEventData
     /// </summary>
     public bool Reconnect { get; }
 
-    public ConnectionEventData(DbConnection connection, bool reconnect = false)
+    /// <summary>
+    /// The <see cref="Session"/> that owns the open operation, if the connection is being
+    /// opened on behalf of a session. <see langword="null"/> for domain/driver opens
+    /// that are not session-scoped.
+    /// </summary>
+    public Session Session { get; }
+
+    public ConnectionEventData(DbConnection connection, bool reconnect = false, Session session = null)
     {
       ArgumentNullException.ThrowIfNull(connection);
       Connection = connection;
       Reconnect = reconnect;
+      Session = session;
     }
   }
 }
diff --git a/Orm/Xtensive.Orm/Orm/ConnectionInitEventData.cs b/Orm/Xtensive.Orm/Orm/ConnectionInitEventData.cs
@@ -2,8 +2,8 @@
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 
+using System;
 using System.Data.Common;
-using Xtensive.Core;
 
 namespace Xtensive.Orm
 {
@@ -17,8 +17,12 @@ public class ConnectionInitEventData : ConnectionEventData
     /// </summary>
     public string InitializationScript { get; }
 
-    public ConnectionInitEventData(string initializationScript, DbConnection connection, bool reconnect = false)
-      : base(connection, reconnect)
+    public ConnectionInitEventData(
+      string initializationScript,
+      DbConnection connection,
+      bool reconnect = false,
+      Session session = null)
+      : base(connection, reconnect, session)
     {
       ArgumentException.ThrowIfNullOrEmpty(initializationScript);
       InitializationScript = initializationScript;

diff --git a/Orm/Xtensive.Orm/Orm/Providers/StorageDriver.Operations.cs b/Orm/Xtensive.Orm/Orm/Providers/StorageDriver.Operations.cs
@@ -81,10 +81,10 @@ public void OpenConnection(Session session, SqlConnection connection)
 
       try {
         if (!string.IsNullOrEmpty(script)) {
-          connection.OpenAndInitialize(script);
+          connection.OpenAndInitialize(script, session);
         }
         else {
-          connection.Open();
+          connection.Open(session);
         }
       }
       catch (Exception exception) {
@@ -106,10 +106,10 @@ public async Task OpenConnectionAsync(Session session, SqlConnection connection,
 
       try {
         if (!string.IsNullOrEmpty(script)) {
-          await connection.OpenAndInitializeAsync(script, cancellationToken).ConfigureAwaitFalse();
+          await connection.OpenAndInitializeAsync(script, session, cancellationToken).ConfigureAwaitFalse();
         }
         else {
-          await connection.OpenAsync(cancellationToken).ConfigureAwaitFalse();
+          await connection.OpenAsync(session, cancellationToken).ConfigureAwaitFalse();
         }
       }
       catch (OperationCanceledException) {