Added Convert method overload with 3 parameters (from H3)

SVN: trunk@2004

Author: Sergey Koshcheyev

src/NHibernate/ADOException.cs

@@ -1,7 +1,7 @@
 using System;
-using System.Data;
 using System.Runtime.Serialization;
-using log4net;
+
+using NHibernate.SqlCommand;
 
 namespace NHibernate
 {
@@ -16,6 +16,8 @@ namespace NHibernate
 	[ Serializable ]
 	public class ADOException : HibernateException
 	{
+		private SqlString sql;
+
 		/// <summary>
 		/// Initializes a new instance of the <see cref="ADOException"/> class.
 		/// </summary>
@@ -29,6 +31,12 @@ public ADOException( string message, Exception innerException ) : base( message,
 		{
 		}
 
+		public ADOException( string message, Exception innerException, SqlString sql )
+			: base( message, innerException )
+		{
+			this.sql = sql;
+		}
+
 		/// <summary>
 		/// Initializes a new instance of the <see cref="ADOException"/> class.
 		/// </summary>
@@ -41,7 +49,18 @@ public ADOException( string message, Exception innerException ) : base( message,
 		/// </param>
 		protected ADOException( SerializationInfo info, StreamingContext context ) : base( info, context )
 		{
+			this.sql = ( SqlString ) info.GetValue( "sql", typeof( SqlString ) );
 		}
 
+		public override void GetObjectData(SerializationInfo info, StreamingContext context)
+		{
+			base.GetObjectData( info, context );
+			info.AddValue( "sql", sql );
+		}
+
+		public SqlString SqlString
+		{
+			get { return sql; }
+		}
 	}
 }

src/NHibernate/Exceptions/ADOExceptionHelper.cs

@@ -1,5 +1,6 @@
 using System;
 
+using NHibernate.SqlCommand;
 using NHibernate.Util;
 
 namespace NHibernate.Exceptions
@@ -24,5 +25,12 @@ public static ADOException Convert( /*ISQLExceptionConverter converter,*/ System
 			// return converter.Convert( sqlException, message );
 			return new ADOException( message, sqlException );
 		}
+
+		public static ADOException Convert( System.Exception sqlException, string message, SqlString sql )
+		{
+			ADOExceptionReporter.LogExceptions( sqlException, message + " [" + sql + "]" );
+			return new ADOException( message, sqlException, sql );
+
+		}
 	}
 }