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 NHibernate.AdoNet;
@@ -10,12 +11,26 @@
 using NHibernate.Hql.Ast.ANTLR;
 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

@@ -184,6 +184,11 @@ public IDbConnection 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

@@ -185,6 +185,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
@@ -1337,6 +1338,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>
@@ -1725,6 +1730,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;
@@ -18,6 +19,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;
@@ -14,6 +15,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

@@ -31,6 +31,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/DB2400Driver.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Data;
 
 namespace NHibernate.Driver
 {
@@ -20,6 +21,14 @@ public DB2400Driver() : base(
 		{
 		}
 
+		public override void AddNotificationHandler(IDbConnection con, Delegate handler)
+		{
+			//NH-3724
+			con.GetType().GetEvent("InfoMessage").AddEventHandler(con, handler);
+
+			base.AddNotificationHandler(con, handler);
+		}
+
 		public override bool UseNamedPrefixInSql
 		{
 			get { return false; }

src/NHibernate/Driver/DB2Driver.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Data;
 
 namespace NHibernate.Driver
 {
@@ -21,6 +22,14 @@ public DB2Driver() : base(
 		{
 		}
 
+		public override void AddNotificationHandler(IDbConnection con, Delegate handler)
+		{
+			//NH-3724
+			con.GetType().GetEvent("InfoMessage").AddEventHandler(con, handler);
+
+			base.AddNotificationHandler(con, handler);
+		}
+
 		public override bool UseNamedPrefixInSql
 		{
 			get { return false; }

src/NHibernate/Driver/DotConnectMySqlDriver.cs

@@ -1,4 +1,7 @@
-namespace NHibernate.Driver
+using System;
+using System.Data;
+
+namespace NHibernate.Driver
 {
     /// <summary>
     /// Provides a database driver for dotConnect for MySQL by DevArt.
@@ -28,6 +31,14 @@ public DotConnectMySqlDriver() : base(
         {
         }
 
+		public override void AddNotificationHandler(IDbConnection con, Delegate handler)
+		{
+			//NH-3724
+			con.GetType().GetEvent("InfoMessage").AddEventHandler(con, handler);
+
+			base.AddNotificationHandler(con, handler);
+		}
+
         /// <summary>
         /// Devart.Data.MySql uses named parameters in the sql.
         /// </summary>

src/NHibernate/Driver/DriverBase.cs

@@ -20,6 +20,12 @@ public abstract class DriverBase : IDriver, ISqlParameterFormatter
 		private int commandTimeout;
 		private bool prepareSql;
 
+		public virtual void AddNotificationHandler(IDbConnection con, Delegate handler)
+		{
+			//NH-3724
+			//do nothing by default
+		}
+
 		public virtual void Configure(IDictionary<string, string> settings)
 		{
 			// Command timeout

src/NHibernate/Driver/FirebirdClientDriver.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
@@ -35,6 +36,14 @@ public FirebirdClientDriver()
 		{
 		}
 
+		public override void AddNotificationHandler(IDbConnection con, Delegate handler)
+		{
+			//NH-3724
+			con.GetType().GetEvent("InfoMessage").AddEventHandler(con, handler);
+
+			base.AddNotificationHandler(con, handler);
+		}
+
 		public override bool UseNamedPrefixInSql
 		{
 			get { return true; }

src/NHibernate/Driver/IDriver.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Data;
 using NHibernate.Engine;
@@ -35,6 +36,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 IDbConnection object for the specific Driver
 		/// </summary>

src/NHibernate/Driver/IfxDriver.cs

@@ -1,3 +1,6 @@
+using System;
+using System.Data;
+
 namespace NHibernate.Driver
 {
 	/// <summary>
@@ -20,6 +23,14 @@ public IfxDriver()
 		{
 		}
 
+		public override void AddNotificationHandler(IDbConnection con, Delegate handler)
+		{
+			//NH-3724
+			con.GetType().GetEvent("InfoMessage").AddEventHandler(con, handler);
+
+			base.AddNotificationHandler(con, handler);
+		}
+
 		public override bool UseNamedPrefixInSql
 		{
 			get { return false; }

src/NHibernate/Driver/IngresDriver.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Data;
 
 namespace NHibernate.Driver
 {
@@ -11,6 +12,14 @@ public class IngresDriver : ReflectionBasedDriver
 	{
 		public IngresDriver() : base("Ingres.Client", "Ingres.Client.IngresConnection", "Ingres.Client.IngresCommand") {}
 
+		public override void AddNotificationHandler(IDbConnection con, Delegate handler)
+		{
+			//NH-3724
+			con.GetType().GetEvent("InfoMessage").AddEventHandler(con, handler);
+
+			base.AddNotificationHandler(con, handler);
+		}
+
 		public override bool UseNamedPrefixInSql
 		{
 			get { return false; }

src/NHibernate/Driver/MySqlDataDriver.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Data;
 
 namespace NHibernate.Driver
 {
@@ -32,6 +33,14 @@ public MySqlDataDriver() : base(
 		{
 		}
 
+		public override void AddNotificationHandler(IDbConnection con, Delegate handler)
+		{
+			//NH-3724
+			con.GetType().GetEvent("InfoMessage").AddEventHandler(con, handler);
+
+			base.AddNotificationHandler(con, handler);
+		}
+
 		/// <summary>
 		/// MySql.Data uses named parameters in the sql.
 		/// </summary>

src/NHibernate/Driver/NpgsqlDriver.cs

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

src/NHibernate/Driver/OdbcDriver.cs

@@ -13,6 +13,17 @@ namespace NHibernate.Driver
 	/// </remarks>
 	public class OdbcDriver : DriverBase
 	{
+		public override void AddNotificationHandler(IDbConnection con, Delegate handler)
+		{
+			//NH-3724
+			if (handler is OdbcInfoMessageEventHandler)
+			{
+				(con as OdbcConnection).InfoMessage += (OdbcInfoMessageEventHandler)handler;
+			}
+
+			base.AddNotificationHandler(con, handler);
+		}
+
 		public override IDbConnection CreateConnection()
 		{
 			return new OdbcConnection();

src/NHibernate/Driver/OleDbDriver.cs

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

src/NHibernate/Driver/OracleClientDriver.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Data;
 using NHibernate.Engine.Query;
 using NHibernate.SqlTypes;
@@ -18,6 +19,14 @@ public OracleClientDriver() :
 			"System.Data.OracleClient.OracleConnection", 
 			"System.Data.OracleClient.OracleCommand") { }
 
+		public override void AddNotificationHandler(IDbConnection con, Delegate handler)
+		{
+			//NH-3724
+			con.GetType().GetEvent("InfoMessage").AddEventHandler(con, handler);
+
+			base.AddNotificationHandler(con, handler);
+		}
+
 		public override bool UseNamedPrefixInSql
 		{
 			get { return true; }

src/NHibernate/Driver/OracleDataClientDriver.cs

@@ -51,6 +51,14 @@ public OracleDataClientDriver()
 			oracleDbTypeXmlType = Enum.Parse(oracleDbTypeEnum, "XmlType");
 		}
 
+		public override void AddNotificationHandler(IDbConnection con, Delegate handler)
+		{
+			//NH-3724
+			con.GetType().GetEvent("InfoMessage").AddEventHandler(con, handler);
+
+			base.AddNotificationHandler(con, handler);
+		}
+
 		/// <summary></summary>
 		public override bool UseNamedPrefixInSql
 		{