HHH-4412 Corrected multiple test issues found in matrix CI

Author: brmeyer

hibernate-core/src/test/java/org/hibernate/test/jpa/ql/DestinationEntity.java

@@ -37,7 +37,7 @@
 @Table(name = "destination_entity")
 @NamedNativeQueries({
 		@NamedNativeQuery(name = "DestinationEntity.insertSelect", query = "insert into destination_entity(id, from_id, fullNameFrom) "
-				+ " select fe.id, fe.id, concat(fe.name, fe.lastName) from from_entity fe where fe.id in (:ids)"),
+				+ " select fe.id, fe.id, fe.name||fe.lastName from from_entity fe where fe.id in (:ids)"),
 		@NamedNativeQuery(name = "DestinationEntity.insert", query = "insert into destination_entity(id, from_id, fullNameFrom) "
 				+ "values (:generatedId, :fromId, :fullName)"),
 		@NamedNativeQuery(name = "DestinationEntity.update", query = "update destination_entity set from_id=:idFrom, fullNameFrom=:fullName"

hibernate-core/src/test/java/org/hibernate/test/jpa/ql/NamedNativeQueryTest.java

@@ -31,7 +31,9 @@
 import org.hibernate.Query;
 import org.hibernate.Session;
 import org.hibernate.dialect.MySQLDialect;
+import org.hibernate.dialect.SQLServerDialect;
 import org.hibernate.testing.SkipForDialect;
+import org.hibernate.testing.SkipForDialects;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Test;
 
@@ -151,8 +153,10 @@ public void testInsertSingleValue() {
 	}
 
 	@Test
-	@SkipForDialect( value = MySQLDialect.class,
-			comment = "MySQL appears to have trouble with fe.id selected twice in one statement")
+	@SkipForDialects( {
+		@SkipForDialect( value = MySQLDialect.class, comment = "MySQL appears to have trouble with fe.id selected twice in one statement"),
+		@SkipForDialect( value = SQLServerDialect.class, comment = "SQL Server does not support the || operator.")
+	} )
 	// TODO: Re-form DestinationEntity.insertSelect to something more supported?
 	public void testInsertMultipleValues() {
 		final String name = "Name";