StorageDriver: connection info and init sql values are based on storage node

Author: alex-kulakov

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

@@ -44,12 +44,15 @@ public SqlConnection CreateConnection(Session session)
       }
 
       var sessionConfiguration = GetConfiguration(session);
-      if (sessionConfiguration.ConnectionInfo!=null)
-        connection.ConnectionInfo = sessionConfiguration.ConnectionInfo;
       connection.CommandTimeout = sessionConfiguration.DefaultCommandTimeout;
+      var connectionInfo = GetConnectionInfo(session) ?? sessionConfiguration.ConnectionInfo;
+      if (connectionInfo != null) {
+        connection.ConnectionInfo = connectionInfo;
+      }
 
-      if (!string.IsNullOrEmpty(configuration.ConnectionInitializationSql))
-        SetInitializationSql(connection, configuration.ConnectionInitializationSql);
+      var connectionInitializationSql = GetInitializationSql(session) ?? configuration.ConnectionInitializationSql;
+      if (!string.IsNullOrEmpty(connectionInitializationSql))
+        SetInitializationSql(connection, connectionInitializationSql);
 
       return connection;
     }
@@ -339,7 +342,23 @@ private void SetInitializationSql(SqlConnection connection, string script)
 
     private SessionConfiguration GetConfiguration(Session session)
     {
-      return session!=null ? session.Configuration : configuration.Sessions.System;
+      return session != null ? session.Configuration : configuration.Sessions.System;
+    }
+
+    private ConnectionInfo GetConnectionInfo(Session session)
+    {
+      return session == null
+        ? null
+        : session.GetStorageNodeInternal()?.Configuration.ConnectionInfo
+          ?? session.Configuration.ConnectionInfo;
+    }
+
+    private string GetInitializationSql(Session session)
+    {
+      return session == null || session.GetStorageNodeInternal() == null
+        || string.IsNullOrEmpty(session.GetStorageNodeInternal().Configuration.ConnectionInitializationSql)
+        ? null
+        : session.StorageNode.Configuration.ConnectionInitializationSql;
     }
   }
 }

Orm/Xtensive.Orm/Orm/Session.cs

@@ -302,6 +302,12 @@ internal void SetStorageNode(StorageNode node)
       storageNode = node;
     }
 
+    // gets node directly
+    internal StorageNode GetStorageNodeInternal()
+    {
+      return storageNode;
+    }
+
     public ExecutableProvider Compile(CompilableProvider provider)
     {
       return CompilationService.Compile(provider, CompilationService.CreateConfiguration(this));