NH-3710 - Can SetLockMode on DetachedCriteria

Author: rjperes

src/NHibernate.Test/Criteria/CriteriaQueryTest.cs

@@ -2983,5 +2983,27 @@ public void IgnoreCase()
 				t.Commit();
 			}
 		}
+
+		[Test]
+		public void CanSetLockModeOnDetachedCriteria()
+		{
+			//NH-3710
+			var dc = DetachedCriteria
+				.For(typeof(Student))
+				.SetLockMode(LockMode.Upgrade);
+
+			using (var session = OpenSession())
+			using (var tx = session.BeginTransaction())
+			{
+				session.Save(new Student { Name = "Ricardo Peres", StudentNumber = 666, CityState = new CityState("Coimbra", "Portugal") });
+				session.Flush();
+
+				var ec = dc.GetExecutableCriteria(session);
+				var countExec = CriteriaTransformer.TransformToRowCount(ec);
+				var countRes = countExec.UniqueResult();
+
+				Assert.AreEqual(countRes, 1);
+			}
+		}
 	}
 }

src/NHibernate/Loader/Criteria/CriteriaLoader.cs

@@ -165,20 +165,25 @@ protected override SqlString ApplyLocks(SqlString sqlSelectString, IDictionary<s
 				return sqlSelectString;
 			}
 
-			Dictionary<string, LockMode> aliasedLockModes = new Dictionary<string, LockMode>();
+			//Dictionary<string, LockMode> aliasedLockModes = new Dictionary<string, LockMode>();
 			Dictionary<string, string[]> keyColumnNames = dialect.ForUpdateOfColumns ? new Dictionary<string, string[]>() : null;
 			string[] drivingSqlAliases = Aliases;
-			for (int i = 0; i < drivingSqlAliases.Length; i++)
+
+			//NH-3710: if we are issuing an aggregation function, Aliases will be null
+			if (drivingSqlAliases != null)
 			{
-				LockMode lockMode;
-				if (lockModes.TryGetValue(drivingSqlAliases[i], out lockMode))
+				for (int i = 0; i < drivingSqlAliases.Length; i++)
 				{
-					ILockable drivingPersister = (ILockable) EntityPersisters[i];
-					string rootSqlAlias = drivingPersister.GetRootTableAlias(drivingSqlAliases[i]);
-					aliasedLockModes[rootSqlAlias] = lockMode;
-					if (keyColumnNames != null)
+					LockMode lockMode;
+					if (lockModes.TryGetValue(drivingSqlAliases[i], out lockMode))
 					{
-						keyColumnNames[rootSqlAlias] = drivingPersister.RootTableIdentifierColumnNames;
+						ILockable drivingPersister = (ILockable)EntityPersisters[i];
+						string rootSqlAlias = drivingPersister.GetRootTableAlias(drivingSqlAliases[i]);
+						//aliasedLockModes[rootSqlAlias] = lockMode;
+						if (keyColumnNames != null)
+						{
+							keyColumnNames[rootSqlAlias] = drivingPersister.RootTableIdentifierColumnNames;
+						}
 					}
 				}
 			}