Fix newly added tests for derby

Author: beikov

hibernate-core/src/main/java/org/hibernate/dialect/DerbyTenSixDialect.java

@@ -27,4 +27,10 @@ public DerbyTenSixDialect() {
 	public boolean supportsSequences() {
 		return true;
 	}
+
+	@Override
+	public String getCrossJoinSeparator() {
+		// 10.6 introduced support for the cross join syntax: http://db.apache.org/derby/docs/10.6/ref/rrefsqljcrossjoin.html
+		return " cross join ";
+	}
 }

hibernate-core/src/test/java/org/hibernate/test/hql/size/ManyToManySizeTest2.java

@@ -557,6 +557,7 @@ public void setTeacher(Teacher teacher) {
 	}
 
 	private static int countNumberOfJoins(String query) {
-		return query.toLowerCase( Locale.ROOT ).split( " join ", -1 ).length - 1;
+		String fromPart = query.toLowerCase( Locale.ROOT ).split( " from " )[1].split( " where " )[0];
+		return fromPart.split( "(\\sjoin\\s|,\\s)", -1 ).length - 1;
 	}
 }

hibernate-core/src/test/java/org/hibernate/test/hql/size/OneToManySizeTest2.java

@@ -554,6 +554,7 @@ public void setTeacher(Teacher teacher) {
 	}
 
 	private static int countNumberOfJoins(String query) {
-		return query.toLowerCase( Locale.ROOT ).split( " join ", -1 ).length - 1;
+		String fromPart = query.toLowerCase( Locale.ROOT ).split( " from " )[1].split( " where " )[0];
+		return fromPart.split( "(\\sjoin\\s|,\\s)", -1 ).length - 1;
 	}
 }