nhibernate-commit

[Nhibernate-commit] SF.net SVN: nhibernate:[3857] trunk/nhibernate/src/NHibernate/Loader/Loader .cs

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

Revision: 3857
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3857&view=rev
Author:   ayenderahien
Date:     2008-10-15 12:03:06 +0000 (Wed, 15 Oct 2008)

Log Message:
-----------
minor - fixing spelling mistake

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Loader/Loader.cs

Modified: trunk/nhibernate/src/NHibernate/Loader/Loader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Loader.cs	2008-10-15 11:55:40 UTC (rev 3856)
+++ trunk/nhibernate/src/NHibernate/Loader/Loader.cs	2008-10-15 12:03:06 UTC (rev 3857)
@@ -1688,10 +1688,10 @@
 		protected IList DoList(ISessionImplementor session, QueryParameters queryParameters)
 		{
 			bool statsEnabled = Factory.Statistics.IsStatisticsEnabled;
-			var stopWath = new Stopwatch();
+			var stopWatch = new Stopwatch();
 			if (statsEnabled)
 			{
-				stopWath.Start();
+				stopWatch.Start();
 			}
 
 			IList result;
@@ -1711,8 +1711,8 @@
 			}
 			if (statsEnabled)
 			{
-				stopWath.Stop();
-				Factory.StatisticsImplementor.QueryExecuted(QueryIdentifier, result.Count, stopWath.Elapsed);
+				stopWatch.Stop();
+				Factory.StatisticsImplementor.QueryExecuted(QueryIdentifier, result.Count, stopWatch.Elapsed);
 			}
 			return result;
 		}


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

[Nhibernate-commit] SF.net SVN: nhibernate:[5366] trunk/nhibernate/src/NHibernate/Loader/Loader .cs

[<ric...@us...>]

Revision: 5366
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5366&view=rev
Author:   ricbrown
Date:     2011-01-23 19:45:35 +0000 (Sun, 23 Jan 2011)

Log Message:
-----------
Fix NH-2512 (QueryOver with Where clause and Take crashes) - Informix failing on NHibernate.Test.NHSpecificTest.NH1413.PagingTest.Bug

Also fixes Informix tests:

NHibernate.Test.ProjectionFixtures.Fixture.LimitingResultSetOnQueryThatIsOrderedByProjection
NHibernate.Test.ProjectionFixtures.Fixture.QueryingWithParemetersAndParaemtersInOrderBy

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Loader/Loader.cs

Modified: trunk/nhibernate/src/NHibernate/Loader/Loader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Loader.cs	2011-01-22 14:50:28 UTC (rev 5365)
+++ trunk/nhibernate/src/NHibernate/Loader/Loader.cs	2011-01-23 19:45:35 UTC (rev 5366)
@@ -1222,7 +1222,8 @@
 
 		private int GetFirstLimitParameterCount(Dialect.Dialect dialect, bool useLimit, bool hasFirstRow, bool useOffset)
 		{
-			if (!useLimit) return 0;
+            if (!useLimit) return 0;
+			if (!dialect.SupportsVariableLimit) return 0;
 			if (!dialect.BindLimitParametersFirst) return 0;
 			return (hasFirstRow && useOffset) ? 2 : 1;
 		}


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

[Nhibernate-commit] SF.net SVN: nhibernate:[5942] trunk/nhibernate/src/NHibernate/Loader/Loader .cs

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

Revision: 5942
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5942&view=rev
Author:   fabiomaulo
Date:     2011-06-17 12:08:27 +0000 (Fri, 17 Jun 2011)

Log Message:
-----------
Removed TODO

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Loader/Loader.cs

Modified: trunk/nhibernate/src/NHibernate/Loader/Loader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Loader.cs	2011-06-17 12:05:56 UTC (rev 5941)
+++ trunk/nhibernate/src/NHibernate/Loader/Loader.cs	2011-06-17 12:08:27 UTC (rev 5942)
@@ -1680,7 +1680,6 @@
 
 		protected void AdjustQueryParametersForSubSelectFetching(SqlString sqlString, IEnumerable<IParameterSpecification> parameterSpecs, QueryParameters queryParameters)
 		{
-			// TODO: Remove this when all parameters are managed using IParameterSpecification (QueryParameters does not need to have decomposed values for filters)
 			queryParameters.ProcessedSql = sqlString;
 			queryParameters.ProcessedSqlParameters = parameterSpecs.ToList();
 		}


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

[Nhibernate-commit] SF.net SVN: nhibernate:[5960] trunk/nhibernate/src/NHibernate/Loader/Loader .cs

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

Revision: 5960
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5960&view=rev
Author:   fabiomaulo
Date:     2011-06-19 20:57:39 +0000 (Sun, 19 Jun 2011)

Log Message:
-----------
Fix NH-2125

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Loader/Loader.cs

Modified: trunk/nhibernate/src/NHibernate/Loader/Loader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Loader.cs	2011-06-18 23:03:18 UTC (rev 5959)
+++ trunk/nhibernate/src/NHibernate/Loader/Loader.cs	2011-06-19 20:57:39 UTC (rev 5960)
@@ -518,28 +518,41 @@
 			if (keys.Count > 1)
 			{
 				//if we only returned one entity, query by key is more efficient
+				var subSelects = CreateSubselects(keys, queryParameters).ToArray();
 
-				ISet<EntityKey>[] keySets = Transpose(keys);
-
-				ILoadable[] loadables = EntityPersisters;
-				string[] aliases = Aliases;
-
 				foreach (EntityKey[] rowKeys in keys)
 				{
 					for (int i = 0; i < rowKeys.Length; i++)
 					{
-						if (rowKeys[i] != null && loadables[i].HasSubselectLoadableCollections)
+						if (rowKeys[i] != null && subSelects[i] != null)
 						{
-							SubselectFetch subselectFetch =
-								new SubselectFetch(aliases[i], loadables[i], queryParameters, keySets[i]);
-
-							session.PersistenceContext.BatchFetchQueue.AddSubselect(rowKeys[i], subselectFetch);
+							session.PersistenceContext.BatchFetchQueue.AddSubselect(rowKeys[i], subSelects[i]);
 						}
 					}
 				}
 			}
 		}
 
+		private IEnumerable<SubselectFetch> CreateSubselects(IList<EntityKey[]> keys, QueryParameters queryParameters)
+		{
+			// see NH-2123 NH-2125
+			ISet<EntityKey>[] keySets = Transpose(keys);
+			ILoadable[] loadables = EntityPersisters;
+			string[] aliases = Aliases;
+
+			for (int i = 0; i < loadables.Length; i++)
+			{
+				if (loadables[i].HasSubselectLoadableCollections)
+				{
+					yield return new SubselectFetch(aliases[i], loadables[i], queryParameters, keySets[i]);
+				}
+				else
+				{
+					yield return null;
+				}
+			}
+		}
+
 		internal void InitializeEntitiesAndCollections(IList hydratedObjects, object resultSetId, ISessionImplementor session, bool readOnly)
 		{
 			ICollectionPersister[] collectionPersisters = CollectionPersisters;


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