Partially revert bf8056a "Fix NH-2673, NH-1090, NH-1344" plus some later changes that depend on it. Will port refactored result transformer handling from Hibernate instead.

Author: oskarb

src/NHibernate/Cache/QueryKey.cs

@@ -60,11 +60,6 @@ public QueryKey(ISessionFactoryImplementor factory, SqlString queryString, Query
 			_hashCode = ComputeHashCode();
 		}
 
-		public bool HasResultTransformer
-		{
-			get { return _customTransformer != null; }
-		}
-
 		public QueryKey SetFirstRows(int[] firstRows)
 		{
 			_multiQueriesFirstRows = firstRows;

src/NHibernate/Cache/StandardQueryCache.cs

@@ -68,7 +68,7 @@ public bool Put(QueryKey key, ICacheAssembler[] returnTypes, IList result, bool
 			IList cacheable = new List<object>(result.Count + 1) {ts};
 			for (int i = 0; i < result.Count; i++)
 			{
-				if (returnTypes.Length == 1 && !key.HasResultTransformer)
+				if (returnTypes.Length == 1)
 				{
 					cacheable.Add(returnTypes[0].Disassemble(result[i], session, null));
 				}
@@ -109,7 +109,7 @@ public IList Get(QueryKey key, ICacheAssembler[] returnTypes, bool isNaturalKeyL
 			Log.DebugFormat("returning cached query results for: {0}", key);
 			for (int i = 1; i < cacheable.Count; i++)
 			{
-				if (returnTypes.Length == 1 && !key.HasResultTransformer)
+				if (returnTypes.Length == 1)
 				{
 					returnTypes[0].BeforeAssemble(cacheable[i], session);
 				}
@@ -124,7 +124,7 @@ public IList Get(QueryKey key, ICacheAssembler[] returnTypes, bool isNaturalKeyL
 			{
 				try
 				{
-					if (returnTypes.Length == 1 && !key.HasResultTransformer)
+					if (returnTypes.Length == 1)
 					{
 						result.Add(returnTypes[0].Assemble(cacheable[i], session, null));
 					}

src/NHibernate/Impl/CriteriaImpl.cs

@@ -26,7 +26,7 @@ public class CriteriaImpl : ICriteria
 		private int timeout = RowSelection.NoValue;
 		private int fetchSize = RowSelection.NoValue;
 		private ISessionImplementor session;
-		private IResultTransformer resultTransformer;
+		private IResultTransformer resultTransformer = CriteriaSpecification.RootEntity;
 		private bool cacheable;
 		private string cacheRegion;
 		private CacheMode? cacheMode;

src/NHibernate/Loader/Criteria/CriteriaLoader.cs

@@ -79,6 +79,7 @@ protected override object GetResultColumnOrRow(object[] row, IResultTransformer
 													   ISessionImplementor session)
 		{
 			object[] result;
+			string[] aliases;
 
 			if (translator.HasProjection)
 			{
@@ -101,18 +102,14 @@ protected override object GetResultColumnOrRow(object[] row, IResultTransformer
 					}
 					position += numColumns;
 				}
+				aliases = translator.ProjectedAliases;
 			}
 			else
 			{
 				result = row;
+				aliases = userAliases;
 			}
-
-			if (customResultTransformer == null)
-			{
-				// apply the defaut transformer of criteria aka RootEntityResultTransformer
-				return result[result.Length - 1];
-			}
-			return result;
+			return translator.RootCriteria.ResultTransformer.TransformTuple(result, aliases);
 		}
 
 		protected override SqlString ApplyLocks(SqlString sqlSelectString, IDictionary<string, LockMode> lockModes,
@@ -165,20 +162,9 @@ public override LockMode[] GetLockModes(IDictionary<string, LockMode> lockModes)
 			return lockModesArray;
 		}
 
-		public override IList GetResultList(IList results, IResultTransformer customResultTransformer)
+		public override IList GetResultList(IList results, IResultTransformer resultTransformer)
 		{
-			if (customResultTransformer == null)
-			{
-				// apply the defaut transformer of criteria aka RootEntityResultTransformer
-				return results;
-			}
-			for (int i = 0; i < results.Count; i++)
-			{
-				var row = results[i] as object[] ?? new object[] { results[i] };
-				object result = customResultTransformer.TransformTuple(row, translator.HasProjection ? translator.ProjectedAliases : userAliases);
-				results[i] = result;
-			}
-			return customResultTransformer.TransformList(results);
+			return translator.RootCriteria.ResultTransformer.TransformList(results);
 		}
 
 		protected override IEnumerable<IParameterSpecification> GetParameterSpecifications()