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

[<fab...@us...>]

Revision: 5051
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5051&view=rev
Author:   fabiomaulo
Date:     2010-07-23 03:51:24 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
Fix NH-2166

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Exceptions/ADOExceptionHelper.cs
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
    trunk/nhibernate/src/NHibernate.Test/ProjectionFixtures/Fixture.cs

Added Paths:
-----------
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2166/
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2166/Fixture.cs

Modified: trunk/nhibernate/src/NHibernate/Exceptions/ADOExceptionHelper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Exceptions/ADOExceptionHelper.cs	2010-07-22 20:59:41 UTC (rev 5050)
+++ trunk/nhibernate/src/NHibernate/Exceptions/ADOExceptionHelper.cs	2010-07-23 03:51:24 UTC (rev 5051)
@@ -55,13 +55,13 @@
 			return Convert(converter, new AdoExceptionContextInfo {SqlException = sqlException, Message = message, Sql = sql});
 		}
 
-		public static ADOException Convert(ISQLExceptionConverter converter, Exception sqle, string message, SqlString sql,
+		public static Exception Convert(ISQLExceptionConverter converter, Exception sqle, string message, SqlString sql,
 		                                   object[] parameterValues, IDictionary<string, TypedValue> namedParameters)
 		{
 			sql = TryGetActualSqlQuery(sqle, sql);
 			string extendMessage = ExtendMessage(message, sql != null ? sql.ToString() : null, parameterValues, namedParameters);
 			ADOExceptionReporter.LogExceptions(sqle, extendMessage);
-			return new ADOException(extendMessage, sqle, sql != null ? sql.ToString() : SQLNotAvailable);
+			return Convert(converter, sqle, extendMessage, sql);
 		}
 
 		/// <summary> For the given <see cref="Exception"/>, locates the <see cref="System.Data.Common.DbException"/>. </summary>

Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2166/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2166/Fixture.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2166/Fixture.cs	2010-07-23 03:51:24 UTC (rev 5051)
@@ -0,0 +1,25 @@
+using System;
+using System.Collections;
+using NHibernate.Exceptions;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.NHSpecificTest.NH2166
+{
+	public class Fixture: TestCase
+	{
+		protected override IList Mappings
+		{
+			get { return new string[0]; }
+		}
+
+		[Test]
+		public void WhenUniqueResultShouldCallConverter()
+		{
+			using (var s = OpenSession())
+			{
+				Executing.This(()=> s.CreateSQLQuery("select make from ItFunky").UniqueResult<int>()).Should().Throw<GenericADOException>();
+			}
+		}
+	}
+}
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2010-07-22 20:59:41 UTC (rev 5050)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2010-07-23 03:51:24 UTC (rev 5051)
@@ -470,6 +470,7 @@
     <Compile Include="NHSpecificTest\NH2094\Model.cs" />
     <Compile Include="NHSpecificTest\NH2102\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH2102\Model.cs" />
+    <Compile Include="NHSpecificTest\NH2166\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH2189\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH2189\Model.cs" />
     <Compile Include="NHSpecificTest\ElementsEnums\AbstractIntEnumsBagFixture.cs" />

Modified: trunk/nhibernate/src/NHibernate.Test/ProjectionFixtures/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/ProjectionFixtures/Fixture.cs	2010-07-22 20:59:41 UTC (rev 5050)
+++ trunk/nhibernate/src/NHibernate.Test/ProjectionFixtures/Fixture.cs	2010-07-23 03:51:24 UTC (rev 5051)
@@ -1,3 +1,4 @@
+using System;
 using NHibernate.Criterion;
 using NHibernate.Driver;
 using NUnit.Framework;
@@ -93,7 +94,7 @@
             }
         		Assert.Fail();
         	}
-					catch (ADOException e)
+					catch (Exception e)
         	{
         		if(e.Message != expectedMessage)
         			throw;


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