[Nhibernate-commit] SF.net SVN: nhibernate:[4313] trunk/nhibernate/src/NHibernate

[<aye...@us...>]

Revision: 4313
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4313&view=rev
Author:   ayenderahien
Date:     2009-05-15 07:44:35 +0000 (Fri, 15 May 2009)

Log Message:
-----------
SqlClientBatchingBatcher will now log to added statements consistently, regardless if AbstractBatcher is enabled or not.

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/AdoNet/SqlClientBatchingBatcher.cs
    trunk/nhibernate/src/NHibernate.Test/Ado/BatcherFixture.cs
    trunk/nhibernate/src/NHibernate.Test/LogSpy.cs

Modified: trunk/nhibernate/src/NHibernate/AdoNet/SqlClientBatchingBatcher.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/AdoNet/SqlClientBatchingBatcher.cs	2009-05-15 06:31:42 UTC (rev 4312)
+++ trunk/nhibernate/src/NHibernate/AdoNet/SqlClientBatchingBatcher.cs	2009-05-15 07:44:35 UTC (rev 4313)
@@ -50,7 +50,7 @@
 			}
 			else
 			{
-				Factory.Settings.SqlStatementLogger.LogCommand(batchUpdate, FormatStyle.Basic);
+				Factory.Settings.SqlStatementLogger.LogCommand("Adding to batch:", batchUpdate, FormatStyle.Basic);
 			}
 			currentBatch.Append((System.Data.SqlClient.SqlCommand)batchUpdate);
 			if (currentBatch.CountOfCommands >= batchSize)

Modified: trunk/nhibernate/src/NHibernate.Test/Ado/BatcherFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Ado/BatcherFixture.cs	2009-05-15 06:31:42 UTC (rev 4312)
+++ trunk/nhibernate/src/NHibernate.Test/Ado/BatcherFixture.cs	2009-05-15 07:44:35 UTC (rev 4313)
@@ -120,7 +120,7 @@
 					sessions.Statistics.Clear();
 					FillDb();
 					string logs = sl.GetWholeLog();
-					Assert.That(logs, Text.DoesNotContain("batch").IgnoreCase);
+					Assert.That(logs, Text.DoesNotContain("batcher").IgnoreCase);
 					Assert.That(logs, Text.Contains("INSERT").IgnoreCase);
 				}
 			}

Modified: trunk/nhibernate/src/NHibernate.Test/LogSpy.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/LogSpy.cs	2009-05-15 06:31:42 UTC (rev 4312)
+++ trunk/nhibernate/src/NHibernate.Test/LogSpy.cs	2009-05-15 07:44:35 UTC (rev 4313)
@@ -48,7 +48,10 @@
 			var wholeMessage = new StringBuilder();
 			foreach (LoggingEvent loggingEvent in Appender.GetEvents())
 			{
-				wholeMessage.Append(loggingEvent.RenderedMessage);
+				wholeMessage
+					.Append(loggingEvent.LoggerName)
+					.Append(" ")
+					.Append(loggingEvent.RenderedMessage);
 			}
 			return wholeMessage.ToString();
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.