Fix CriteriaImpl.Clone for Entity Join

src/NHibernate.Test/Async/Criteria/EntityJoinCriteriaTest.cs

@@ -47,7 +47,25 @@ public async Task CanJoinNotAssociatedEntityAsync()
 				Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
 			}
 		}
-
+
+		//GH1680
+		[Test]
+		public void CanRowCountWithEntityJoinAsync()
+		{
+			using (var session = OpenSession())
+			{
+				EntityComplex entityComplex = null;
+				EntityWithNoAssociation root = null;
+				var query = session.QueryOver(() => root)
+						.JoinEntityAlias(() => entityComplex, Restrictions.Where(() => root.Complex1Id == entityComplex.Id));
+
+				var rowCountQuery = query.ToRowCountQuery();
+				int rowCount = 0;
+				Assert.DoesNotThrowAsync(async () => rowCount = await (rowCountQuery.SingleOrDefaultAsync<int>()), "row count query should not throw exception");
+				Assert.That(rowCount, Is.GreaterThan(0), "row count should be > 0");
+			}
+		}
+
 		//check JoinEntityAlias - JoinAlias analog for entity join
 		[Test]
 		public async Task CanJoinNotAssociatedEntity_ExpressionAsync()

src/NHibernate.Test/Criteria/EntityJoinCriteriaTest.cs

@@ -36,7 +36,25 @@ public void CanJoinNotAssociatedEntity()
 				Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
 			}
 		}
-
+
+		//GH1680
+		[Test]
+		public void CanRowCountWithEntityJoin()
+		{
+			using (var session = OpenSession())
+			{
+				EntityComplex entityComplex = null;
+				EntityWithNoAssociation root = null;
+				var query = session.QueryOver(() => root)
+						.JoinEntityAlias(() => entityComplex, Restrictions.Where(() => root.Complex1Id == entityComplex.Id));
+
+				var rowCountQuery = query.ToRowCountQuery();
+				int rowCount = 0;
+				Assert.DoesNotThrow(() => rowCount = rowCountQuery.SingleOrDefault<int>(), "row count query should not throw exception");
+				Assert.That(rowCount, Is.GreaterThan(0), "row count should be > 0");
+			}
+		}
+
 		//check JoinEntityAlias - JoinAlias analog for entity join
 		[Test]
 		public void CanJoinNotAssociatedEntity_Expression()

src/NHibernate/Impl/CriteriaImpl.cs

@@ -594,7 +594,7 @@ private void CloneSubcriteria(CriteriaImpl clone)
 						"Could not find parent for subcriteria in the previous subcriteria. If you see this error, it is a bug");
 				}
 				Subcriteria clonedSubCriteria =
-					new Subcriteria(clone, currentParent, subcriteria.Path, subcriteria.Alias, subcriteria.JoinType, subcriteria.WithClause);
+					new Subcriteria(clone, currentParent, subcriteria.Path, subcriteria.Alias, subcriteria.JoinType, subcriteria.WithClause, subcriteria.JoinEntityName);
 				clonedSubCriteria.SetLockMode(subcriteria.LockMode);
 				newParents[subcriteria] = clonedSubCriteria;
 			}