Rebased

Author: Gunnar Liljas

src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs

@@ -96,6 +96,9 @@ public ISet<string> GetQuerySpaces()
 			{
 				result.UnionWith(collectionPersister.CollectionSpaces);
 			}
+
+			result.UnionWith(subQuerySpaces);
+
 			return result;
 		}
 
@@ -851,7 +854,7 @@ public string[] GetColumnAliasesUsingProjection(ICriteria subcriteria, string pr
 
 		private void CreateSubQuerySpaces()
 		{
-
+			
 			var subQueries =
 				rootCriteria.IterateExpressionEntries()
 				            .Select(x => x.Criterion)
@@ -866,6 +869,23 @@ private void CreateSubQuerySpaces()
 				subQuerySpaces.UnionWith(translator.GetQuerySpaces());
 			}
 
-		}	
+		}
+
+		private void GetSubQueries(CriteriaImpl criteriaImpl, List<CriteriaImpl> subQueries)
+		{
+			var subQueryExpressions =
+				criteriaImpl.IterateExpressionEntries().Select(x => x.Criterion).OfType<SubqueryExpression>().ToList();
+
+			foreach (var subqueryExpression in subQueryExpressions)
+			{
+				var impl = subqueryExpression.Criteria as CriteriaImpl;
+				if (impl != null)
+				{
+					subQueries.Add(impl);
+					GetSubQueries(impl, subQueries);
+				}
+			}
+
+		}
 	}
 }