Proper handling of WarningMessage and InfoMessage on FbService (DNET-843).

Author: cincuranet

Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsDatabase.cs

@@ -38,7 +38,7 @@ internal class GdsDatabase : IDatabase
 
 		#region Callbacks
 
-		public WarningMessageCallback WarningMessage
+		public Action<IscException> WarningMessage
 		{
 			get { return _warningMessage; }
 			set { _warningMessage = value; }
@@ -48,7 +48,7 @@ public WarningMessageCallback WarningMessage
 
 		#region Fields
 
-		protected WarningMessageCallback _warningMessage;
+		protected Action<IscException> _warningMessage;
 
 		private GdsConnection _connection;
 		private GdsEventManager _eventManager;

Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsServiceManager.cs

@@ -23,8 +23,20 @@ namespace FirebirdSql.Data.Client.Managed.Version10
 {
 	internal class GdsServiceManager : IServiceManager
 	{
+		#region Callbacks
+
+		public Action<IscException> WarningMessage
+		{
+			get { return _warningMessage; }
+			set { _warningMessage = value; }
+		}
+
+		#endregion
+
 		#region Fields
 
+		private Action<IscException> _warningMessage;
+
 		private int _handle;
 		private GdsConnection _connection;
 		private GdsDatabase _database;
@@ -56,6 +68,7 @@ public GdsServiceManager(GdsConnection connection)
 		{
 			_connection = connection;
 			_database = CreateDatabase(_connection);
+			RewireWarningMessage();
 		}
 
 		#endregion
@@ -183,6 +196,11 @@ protected virtual GdsDatabase CreateDatabase(GdsConnection connection)
 			return new GdsDatabase(connection);
 		}
 
+		private void RewireWarningMessage()
+		{
+			_database.WarningMessage = ex => _warningMessage?.Invoke(ex);
+		}
+
 		#endregion
 	}
 }

Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesDatabase.cs

@@ -29,7 +29,7 @@ internal sealed class FesDatabase : IDatabase
 	{
 		#region Callbacks
 
-		public WarningMessageCallback WarningMessage
+		public Action<IscException> WarningMessage
 		{
 			get { return _warningMessage; }
 			set { _warningMessage = value; }
@@ -39,7 +39,7 @@ public WarningMessageCallback WarningMessage
 
 		#region Fields
 
-		private WarningMessageCallback _warningMessage;
+		private Action<IscException> _warningMessage;
 
 		private DatabaseHandle _handle;
 		private int _transactionCount;

Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesServiceManager.cs

@@ -23,8 +23,20 @@ namespace FirebirdSql.Data.Client.Native
 {
 	internal sealed class FesServiceManager : IServiceManager
 	{
+		#region Callbacks
+
+		public Action<IscException> WarningMessage
+		{
+			get { return _warningMessage; }
+			set { _warningMessage = value; }
+		}
+
+		#endregion
+
 		#region Fields
 
+		private Action<IscException> _warningMessage;
+
 		private IFbClient _fbClient;
 		private int _handle;
 		private IntPtr[] _statusVector;
@@ -149,8 +161,7 @@ private void ProcessStatusVector(IntPtr[] statusVector)
 			{
 				if (ex.IsWarning)
 				{
-#warning This is not propagated to FesDatabase's callback as with GdsDatabase
-					//_warningMessage?.Invoke(ex);
+					_warningMessage?.Invoke(ex);
 				}
 				else
 				{

Provider/src/FirebirdSql.Data.FirebirdClient/Common/IDatabase.cs

@@ -23,7 +23,7 @@ namespace FirebirdSql.Data.Common
 {
 	internal interface IDatabase : IDisposable
 	{
-		WarningMessageCallback WarningMessage { get; set; }
+		Action<IscException> WarningMessage { get; set; }
 
 		int Handle { get; }
 		int TransactionCount { get; set; }

Provider/src/FirebirdSql.Data.FirebirdClient/Common/IServiceManager.cs

@@ -21,6 +21,8 @@ namespace FirebirdSql.Data.Common
 {
 	internal interface IServiceManager
 	{
+		Action<IscException> WarningMessage { get; set; }
+
 		int Handle { get; }
 
 		void Attach(ServiceParameterBuffer spb, string dataSource, int port, string service, byte[] cryptKey);

Provider/src/FirebirdSql.Data.FirebirdClient/Common/WarningMessageCallback.cs

@@ -481,7 +481,7 @@ public override void Open()
 #endif
 
 				// Bind	Warning	messages event
-				_innerConnection.Database.WarningMessage = new WarningMessageCallback(OnWarningMessage);
+				_innerConnection.Database.WarningMessage = OnWarningMessage;
 
 				// Update the connection state
 				OnStateChange(_state, ConnectionState.Open);

Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnection.cs

@@ -30,6 +30,8 @@ public abstract class FbService
 	{
 		public event EventHandler<ServiceOutputEventArgs> ServiceOutput;
 
+		public event EventHandler<FbInfoMessageEventArgs> InfoMessage;
+
 		private const string ServiceName = "service_mgr";
 
 		private IServiceManager _svc;
@@ -111,6 +113,7 @@ protected void Open()
 					_svc = ClientFactory.CreateServiceManager(_csManager);
 				}
 				_svc.Attach(BuildSpb(), _csManager.DataSource, _csManager.Port, ServiceName, _csManager.CryptKey);
+				_svc.WarningMessage = OnWarningMessage;
 				State = FbServiceState.Open;
 			}
 			catch (Exception ex)
@@ -357,6 +360,11 @@ private byte[] QueryService(byte[] items)
 			}
 		}
 
+		private void OnWarningMessage(IscException warning)
+		{
+			InfoMessage?.Invoke(this, new FbInfoMessageEventArgs(warning));
+		}
+
 		private static FbServerConfig ParseServerConfig(byte[] buffer, ref int pos)
 		{
 			var config = new FbServerConfig();