NH-3724 - Added support for notification handlers

src/NHibernate.Test/CfgTest/Loquacious/ConfigurationFixture.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Data;
 using System.Data.SqlClient;
 using System.IO;
@@ -12,12 +13,26 @@
 using NHibernate.Linq;
 using NHibernate.Type;
 using NUnit.Framework;
+using Environment = NHibernate.Cfg.Environment;
 
 namespace NHibernate.Test.CfgTest.Loquacious
 {
 	[TestFixture]
 	public class ConfigurationFixture
 	{
+		[Test]
+		public void CanSetNotificationHandler()
+		{
+			//NH-3724
+			EventHandler<SqlInfoMessageEventArgs> handler = (s, e) => {};
+			var cfg = new Configuration().DataBaseIntegration(x =>
+			{
+				x.WithNotificationHandler(handler);
+			}).Configure();
+
+			Assert.IsNotNull(cfg.NotificationHandler);
+		}
+
 		[Test]
 		public void CompleteConfiguration()
 		{

src/NHibernate/AdoNet/ConnectionManager.cs

@@ -185,6 +185,11 @@ public DbConnection GetConnection()
 				if (ownConnection)
 				{
 					connection = Factory.ConnectionProvider.GetConnection();
+					//NH-3724
+					if (Factory.Settings.NotificationHandler != null)
+					{
+						Factory.ConnectionProvider.Driver.AddNotificationHandler(connection, Factory.Settings.NotificationHandler);
+					}
 					if (Factory.Statistics.IsStatisticsEnabled)
 					{
 						Factory.StatisticsImplementor.Connect();

src/NHibernate/Cfg/Configuration.cs

@@ -183,6 +183,7 @@ protected void Reset()
 			tableNameBinding = new Dictionary<string, Mappings.TableDescription>();
 			columnNameBindingPerTable = new Dictionary<Table, Mappings.ColumnNames>();
 			filtersSecondPasses = new Queue<FilterSecondPassArgs>();
+			NotificationHandler = null;
 		}
 		[Serializable]
 		private class Mapping : IMapping
@@ -1335,6 +1336,10 @@ public Configuration SetDefaultNamespace(string newDefaultNamespace)
 			return this;
 		}
 
+		//NH-3724
+		[field: NonSerialized]
+		public Delegate NotificationHandler { get; set; }
+
 		/// <summary>
 		/// Sets the default interceptor for use by all sessions.
 		/// </summary>
@@ -1723,6 +1728,8 @@ private Settings BuildSettings()
 			// NH : Set configuration for IdGenerator SQL logging
 			PersistentIdGeneratorParmsNames.SqlStatementLogger.FormatSql = result.SqlStatementLogger.FormatSql;
 			PersistentIdGeneratorParmsNames.SqlStatementLogger.LogToStdout = result.SqlStatementLogger.LogToStdout;
+			//NH-3724
+			result.NotificationHandler = NotificationHandler;
 			return result;
 		}
 

src/NHibernate/Cfg/Loquacious/DbIntegrationConfigurationProperties.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Data;
 using NHibernate.AdoNet;
 using NHibernate.Connection;
@@ -19,6 +20,12 @@ public DbIntegrationConfigurationProperties(Configuration configuration)
 
 		#region Implementation of IDbIntegrationConfigurationProperties
 
+		public void WithNotificationHandler(Delegate handler)
+		{
+			//NH-3724
+			configuration.NotificationHandler = handler;
+		}
+
 		public void Dialect<TDialect>() where TDialect : Dialect.Dialect
 		{
 			configuration.SetProperty(Environment.Dialect, typeof(TDialect).AssemblyQualifiedName);

src/NHibernate/Cfg/Loquacious/IDbIntegrationConfigurationProperties.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Data;
 using NHibernate.AdoNet;
 using NHibernate.Connection;
@@ -15,6 +16,9 @@ public interface IDbIntegrationConfigurationProperties
 		bool LogSqlInConsole { set; }
 		bool LogFormattedSql { set; }
 
+		//NH-3724
+		void WithNotificationHandler(Delegate handler);
+
 		void ConnectionProvider<TProvider>() where TProvider : IConnectionProvider;
 		void Driver<TDriver>() where TDriver : IDriver;
 		IsolationLevel IsolationLevel { set; }

src/NHibernate/Cfg/Settings.cs

@@ -32,6 +32,9 @@ public Settings()
 		//private bool isJdbcBatchVersionedData;
 
 		#endregion
+
+		public Delegate NotificationHandler { get; internal set; }
+
 		public SqlStatementLogger SqlStatementLogger { get; internal set; }
 
 		public int MaximumFetchDepth { get; internal set; }

src/NHibernate/Driver/DriverBase.cs

@@ -21,6 +21,22 @@ public abstract class DriverBase : IDriver, ISqlParameterFormatter
 		private int commandTimeout;
 		private bool prepareSql;
 
+		public virtual void AddNotificationHandler(IDbConnection con, Delegate handler)
+		{
+			//NH-3724
+			if (handler != null)
+			{
+				var prop = con.GetType().GetEvent("InfoMessage");
+
+				if (prop == null)
+				{
+					throw new NotSupportedException("Current driver does not support notifications.");
+				}
+
+				prop.AddEventHandler(con, handler);
+			}
+		}
+
 		public virtual void Configure(IDictionary<string, string> settings)
 		{
 			// Command timeout

src/NHibernate/Driver/IDriver.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
@@ -36,6 +37,13 @@ public interface IDriver
 		/// </summary>
 		void Configure(IDictionary<string, string> settings);
 
+		//NH-3724
+		/// <summary>
+		/// Attaches an event handler for the notification event (InfoMessage in most ADO.NET drivers).
+		/// </summary>
+		/// <param name="handler"></param>
+		void AddNotificationHandler(IDbConnection con, Delegate handler);
+
 		/// <summary>
 		/// Creates an uninitialized DbConnection object for the specific Driver
 		/// </summary>

src/NHibernate/Driver/IfxDriver.cs

@@ -1,3 +1,6 @@
+using System;
+using System.Data;
+
 namespace NHibernate.Driver
 {
 	/// <summary>

src/NHibernate/Driver/MySqlDataDriver.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace NHibernate.Driver
 {
 	/// <summary>

src/NHibernate/Driver/NpgsqlDriver.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Data;
 using System.Data.Common;
 
@@ -40,6 +41,12 @@ public NpgsqlDriver() : base(
 		{
 		}
 
+		public override void AddNotificationHandler(IDbConnection con, Delegate handler)
+		{
+			//NH-3724
+			con.GetType().GetEvent("Notification").AddEventHandler(con, handler);
+		}
+
 		public override bool UseNamedPrefixInSql
 		{
 			get { return true; }

src/NHibernate/Driver/OdbcDriver.cs

@@ -17,6 +17,12 @@ namespace NHibernate.Driver
 	/// </remarks>
 	public class OdbcDriver : DriverBase
 	{
+		public override void AddNotificationHandler(IDbConnection con, Delegate handler)
+		{
+			//NH-3724
+			(con as OdbcConnection).InfoMessage += (OdbcInfoMessageEventHandler)handler;
+		}
+
 		private static readonly IInternalLogger Log = LoggerProvider.LoggerFor(typeof(OdbcDriver));
 
 		private byte? _dbDateTimeScale;

src/NHibernate/Driver/OleDbDriver.cs

@@ -16,6 +16,12 @@ public OleDbDriver()
 		{
 		}
 
+		public override void AddNotificationHandler(IDbConnection con, Delegate handler)
+		{
+			//NH-3724
+			(con as OleDbConnection).InfoMessage += (OleDbInfoMessageEventHandler)handler;
+		}
+
 		public override DbConnection CreateConnection()
 		{
 			return new OleDbConnection();

src/NHibernate/Driver/SQLite20Driver.cs

@@ -1,39 +1,38 @@
-using System;
 using System.Data;
 using System.Data.Common;
 
 namespace NHibernate.Driver
 {
-	/// <summary>
-	/// NHibernate driver for the System.Data.SQLite data provider for .NET 2.0.
-	/// </summary>
-	/// <remarks>
-	/// <p>
-	/// In order to use this driver you must have the System.Data.SQLite.dll assembly available
-	/// for NHibernate to load. This assembly includes the SQLite.dll or SQLite3.dll libraries.
-	/// </p>    
-	/// <p>
-	/// You can get the System.Data.SQLite.dll assembly from http://sourceforge.net/projects/sqlite-dotnet2.
-	/// </p>
-	/// <p>
-	/// Please check <a href="http://www.sqlite.org/">http://www.sqlite.org/</a> for more information regarding SQLite.
-	/// </p>
-	/// </remarks>
-	public class SQLite20Driver : ReflectionBasedDriver
-	{
-		/// <summary>
-		/// Initializes a new instance of <see cref="SQLite20Driver"/>.
-		/// </summary>
-		/// <exception cref="HibernateException">
-		/// Thrown when the <c>SQLite.NET</c> assembly can not be loaded.
-		/// </exception>
-		public SQLite20Driver() : base(
-			"System.Data.SQLite",
-			"System.Data.SQLite",
-			"System.Data.SQLite.SQLiteConnection",
-			"System.Data.SQLite.SQLiteCommand")
-		{
-		}
+    /// <summary>
+    /// NHibernate driver for the System.Data.SQLite data provider for .NET 2.0.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// In order to use this driver you must have the System.Data.SQLite.dll assembly available
+    /// for NHibernate to load. This assembly includes the SQLite.dll or SQLite3.dll libraries.
+    /// </p>    
+    /// <p>
+    /// You can get the System.Data.SQLite.dll assembly from http://sourceforge.net/projects/sqlite-dotnet2.
+    /// </p>
+    /// <p>
+    /// Please check <a href="http://www.sqlite.org/">http://www.sqlite.org/</a> for more information regarding SQLite.
+    /// </p>
+    /// </remarks>
+    public class SQLite20Driver : ReflectionBasedDriver
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="SQLite20Driver"/>.
+        /// </summary>
+        /// <exception cref="HibernateException">
+        /// Thrown when the <c>SQLite.NET</c> assembly can not be loaded.
+        /// </exception>
+        public SQLite20Driver() : base(
+            "System.Data.SQLite",
+            "System.Data.SQLite",
+            "System.Data.SQLite.SQLiteConnection",
+            "System.Data.SQLite.SQLiteCommand")
+        {
+        }
 
         public override DbConnection CreateConnection()
         {
@@ -57,34 +56,34 @@ private static void Connection_StateChange(object sender, StateChangeEventArgs e
             }
         }
 
-		public override bool UseNamedPrefixInSql
-		{
-			get { return true; }
-		}
+        public override bool UseNamedPrefixInSql
+        {
+            get { return true; }
+        }
 
-		public override bool UseNamedPrefixInParameter
-		{
-			get { return true; }
-		}
+        public override bool UseNamedPrefixInParameter
+        {
+            get { return true; }
+        }
 
-		public override string NamedPrefix
-		{
-			get { return "@"; }
-		}
+        public override string NamedPrefix
+        {
+            get { return "@"; }
+        }
 
-		public override bool SupportsMultipleOpenReaders
-		{
-			get { return false; }
-		}
+        public override bool SupportsMultipleOpenReaders
+        {
+            get { return false; }
+        }
 
-		public override IResultSetsCommand GetResultSetsCommand(Engine.ISessionImplementor session)
-		{
-			return new BasicResultSetsCommand(session);
-		}
+        public override IResultSetsCommand GetResultSetsCommand(Engine.ISessionImplementor session)
+        {
+            return new BasicResultSetsCommand(session);
+        }
 
-		public override bool SupportsMultipleQueries
-		{
-			get { return true; }
-		}
-	}
+        public override bool SupportsMultipleQueries
+        {
+            get { return true; }
+        }
+    }
 }

src/NHibernate/Driver/SqlClientDriver.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Data;
 using System.Data.Common;
 using System.Data.SqlClient;
@@ -26,6 +27,12 @@ public class SqlClientDriver : DriverBase, IEmbeddedBatcherFactoryProvider
 		public const byte MaxDateTime2 = 8;
 		public const byte MaxDateTimeOffset = 10;
 
+		public override void AddNotificationHandler(IDbConnection con, Delegate handler)
+		{
+			//NH-3724
+			(con as SqlConnection).InfoMessage += (SqlInfoMessageEventHandler) handler;
+		}
+
 		/// <summary>
 		/// Creates an uninitialized <see cref="DbConnection" /> object for
 		/// the SqlClientDriver.

src/NHibernate/Driver/SqlServerCeDriver.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;

src/NHibernate/Driver/SybaseAseClientDriver.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace NHibernate.Driver
+namespace NHibernate.Driver
 {
 	/// <summary>
 	/// This provides a driver for Sybase ASE 15 using the ADO.NET driver.
@@ -17,7 +15,7 @@ public class SybaseAseClientDriver : ReflectionBasedDriver
 		public SybaseAseClientDriver() : base("Sybase.AdoNet2.AseClient", "Sybase.Data.AseClient.AseConnection", "Sybase.Data.AseClient.AseCommand")
 		{
 		}
-		
+
 		public override string NamedPrefix
 		{
 			get { return "@"; }