HHH-10664 - Prep 6.0 feature branch - merge hibernate-entitymanager i…

…nto hibernate-core (test fixup)

documentation/src/test/java/org/hibernate/userguide/flush/AutoFlushTest.java

@@ -9,6 +9,7 @@
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
+import javax.persistence.FlushModeType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
@@ -126,6 +127,14 @@ public void testFlushAutoSQLNativeSession() {
 			entityManager.persist( person );
 			Session session = entityManager.unwrap(Session.class);
 
+			// for this to work, the Session/EntityManager must be put into COMMIT FlushMode
+			//  - this is a change since 5.2 to account for merging EntityManager functionality
+			// 		directly into Session.  Flushing would be the JPA-spec compliant behavior,
+			//		so we know do that by default.
+			session.setFlushMode( FlushModeType.COMMIT );
+			//		or using Hibernate's FlushMode enum
+			//session.setHibernateFlushMode( FlushMode.COMMIT );
+
 			assertTrue(((Number) session
 					.createSQLQuery( "select count(*) from Person")
 					.uniqueResult()).intValue() == 0 );

hibernate-core/src/main/java/org/hibernate/query/internal/NativeQueryImpl.java

@@ -239,7 +239,11 @@ private boolean shouldFlush() {
 				effectiveFlushMode = getProducer().getHibernateFlushMode();
 			}
 
-			if ( effectiveFlushMode != FlushMode.MANUAL ) {
+			if ( effectiveFlushMode == FlushMode.ALWAYS ) {
+				return true;
+			}
+
+			if ( effectiveFlushMode == FlushMode.AUTO ) {
 				if ( getProducer().getFactory().getSessionFactoryOptions().isJpaBootstrap() ) {
 					return true;
 				}