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

[<te...@us...>]

Revision: 3781
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3781&view=rev
Author:   tehlike
Date:     2008-09-26 19:23:17 +0000 (Fri, 26 Sep 2008)

Log Message:
-----------
Fix for NH1499 by adding meaningful exception: Cannot use subqueries on a criteria without a projection.

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Criterion/SubqueryExpression.cs
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj

Added Paths:
-----------
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1499/

Modified: trunk/nhibernate/src/NHibernate/Criterion/SubqueryExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/SubqueryExpression.cs	2008-09-26 18:24:00 UTC (rev 3780)
+++ trunk/nhibernate/src/NHibernate/Criterion/SubqueryExpression.cs	2008-09-26 19:23:17 UTC (rev 3781)
@@ -104,9 +104,15 @@
 			innerQuery =
 				new CriteriaQueryTranslator(factory, criteriaImpl, //implicit polymorphism not supported (would need a union) 
 				                            criteriaImpl.EntityOrClassName, criteriaQuery.GenerateSQLAlias(), criteriaQuery);
-
-			parameters = innerQuery.GetQueryParameters();
-			types = innerQuery.ProjectedTypes;
+			if (innerQuery.HasProjection)
+			{
+				parameters = innerQuery.GetQueryParameters();
+				types = innerQuery.ProjectedTypes;
+			}
+			else
+			{
+				types = null;
+			}
 		}
 
 		public ICriteria Criteria

Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj	2008-09-26 18:24:00 UTC (rev 3780)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test-3.5.csproj	2008-09-26 19:23:17 UTC (rev 3781)
@@ -491,6 +491,9 @@
     <Compile Include="NHSpecificTest\NH1483\SubClass.cs" />
     <Compile Include="NHSpecificTest\NH1488\Domain.cs" />
     <Compile Include="NHSpecificTest\NH1488\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1499\Document.cs" />
+    <Compile Include="NHSpecificTest\NH1499\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH1499\Person.cs" />
     <Compile Include="NHSpecificTest\NH280\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH280\Foo.cs" />
     <Compile Include="NHSpecificTest\NH1018\Employee.cs" />
@@ -1464,6 +1467,9 @@
     <EmbeddedResource Include="NHSpecificTest\NH1403\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="NHSpecificTest\NH1499\Mappings.hbm.xml" />
+  </ItemGroup>
+  <ItemGroup>
     <Folder Include="Properties\" />
     <Folder Include="Unionsubclass2\" />
   </ItemGroup>


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