Fix SQL formatter failures

Fix string parameter conversion to string.
Prevent formatters throwing away their failures.

Fixes #1319

Author: fredericDelaporte

src/NHibernate.Test/UtilityTest/SqlStatementLoggerFixture.cs

@@ -0,0 +1,44 @@
+using NHibernate.AdoNet.Util;
+using NUnit.Framework;
+
+namespace NHibernate.Test.UtilityTest
+{
+	[TestFixture]
+	public class SqlStatementLoggerFixture
+	{
+		[Test]
+		public void SupportsInvalidSql()
+		{
+			using (var spy = new SqlLogSpy())
+			{
+				var logger = new SqlStatementLogger(false, true);
+				using (var cmd = new System.Data.SqlClient.SqlCommand(
+					"UPDATE Table Set Column = @p0; @p0 = 'Some data with an embedded quote in parentheses and signal word (''UPDATE'') like this: (don't update)'"))
+				{
+					Assert.DoesNotThrow(() => logger.LogCommand(cmd, FormatStyle.Basic));
+				}
+
+				Assert.That(spy.GetWholeLog(), Contains.Substring("Some data with an embedded quote"));
+			}
+		}
+		[Test]
+		public void SupportsKeywordInParameter()
+		{
+			using (var spy = new SqlLogSpy())
+			{
+				var logger = new SqlStatementLogger(false, true);
+				using (var cmd = new System.Data.SqlClient.SqlCommand("UPDATE Table Set Column = @p0;"))
+				{
+					cmd.Parameters.AddWithValue(
+						"p0",
+						"Some data with an embedded quote in parentheses and signal word ('UPDATE') like this: (don't update)");
+					Assert.DoesNotThrow(() => logger.LogCommand(cmd, FormatStyle.Basic));
+				}
+
+				var log = spy.GetWholeLog();
+				Assert.That(log, Contains.Substring("Some data with an embedded quote"));
+				Assert.That(log.Split('\n'), Has.Length.GreaterThan(2), "SQL seems not formatted");
+			}
+		}
+	}
+}

src/NHibernate/AdoNet/Util/BasicFormatter.cs

@@ -7,6 +7,8 @@ namespace NHibernate.AdoNet.Util
 {
 	public class BasicFormatter : IFormatter
 	{
+		private static readonly INHibernateLogger Logger = NHibernateLogger.For(typeof(BasicFormatter));
+
 		protected const string IndentString = "    ";
 		protected const string Initial = "\n    ";
 		protected static readonly HashSet<string> beginClauses = new HashSet<string>();
@@ -60,8 +62,16 @@ static BasicFormatter()
 
 		public virtual string Format(string source)
 		{
-			using (var fp = new FormatProcess(source))
-				return fp.Perform();
+			try
+			{
+				using (var fp = new FormatProcess(source))
+					return fp.Perform();
+			}
+			catch (Exception e)
+			{
+				Logger.Warn(e, "Unable to format provided SQL: {0}", source);
+				return source;
+			}
 		}
 
 		#endregion

src/NHibernate/AdoNet/Util/DdlFormatter.cs

@@ -1,12 +1,13 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
 using NHibernate.Util;
 
 namespace NHibernate.AdoNet.Util
 {
 	public class DdlFormatter: IFormatter
 	{
+		private static readonly INHibernateLogger Logger = NHibernateLogger.For(typeof(DdlFormatter));
+
 		private const string Indent1 = "\n    ";
 		private const string Indent2 = "\n      ";
 		private const string Indent3 = "\n        ";
@@ -19,21 +20,20 @@ public class DdlFormatter: IFormatter
 		/// </summary>
 		public virtual string Format(string sql)
 		{
-			if (sql.StartsWith("create table", StringComparison.OrdinalIgnoreCase))
-			{
-				return FormatCreateTable(sql);
-			}
-			else if (sql.StartsWith("alter table", StringComparison.OrdinalIgnoreCase))
+			try
 			{
-				return FormatAlterTable(sql);
-			}
-			else if (sql.StartsWith("comment on", StringComparison.OrdinalIgnoreCase))
-			{
-				return FormatCommentOn(sql);
+				if (sql.StartsWith("create table", StringComparison.OrdinalIgnoreCase))
+					return FormatCreateTable(sql);
+				if (sql.StartsWith("alter table", StringComparison.OrdinalIgnoreCase))
+					return FormatAlterTable(sql);
+				if (sql.StartsWith("comment on", StringComparison.OrdinalIgnoreCase))
+					return FormatCommentOn(sql);
+				return Indent1 + sql;
 			}
-			else
+			catch (Exception e)
 			{
-				return Indent1 + sql;
+				Logger.Warn(e, "Unable to format provided SQL: {0}", sql);
+				return sql;
 			}
 		}
 

src/NHibernate/AdoNet/Util/SqlStatementLogger.cs

@@ -118,7 +118,7 @@ public string GetParameterLoggableValue(DbParameter parameter)
 
 			if (IsStringType(parameter.DbType))
 			{
-				return string.Concat("'", TruncateWithEllipsis(parameter.Value.ToString(), maxLoggableStringLength), "'");
+				return $"'{TruncateWithEllipsis(parameter.Value.ToString(), maxLoggableStringLength).Replace("'", "''")}'";
 			}
 
 			if (parameter.Value is DateTime)