HHH-10485 : Lazy collections fetched with EntityGraph load with JOIN

hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/EntityGraphWithFetchAnnotationTest.java

@@ -0,0 +1,217 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.jpa.test.graphs;
+
+import java.util.List;
+import java.util.Map;
+import javax.persistence.Entity;
+import javax.persistence.EntityGraph;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+import org.hibernate.jpa.QueryHints;
+import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
+
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider;
+import org.junit.Test;
+
+import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Vlad Mihalcea
+ */
+public class EntityGraphWithFetchAnnotationTest
+		extends BaseEntityManagerFunctionalTestCase {
+
+	private PreparedStatementSpyConnectionProvider connectionProvider;
+
+	@Override
+	protected Map getConfig() {
+		Map config = super.getConfig();
+		config.put(
+				org.hibernate.cfg.AvailableSettings.CONNECTION_PROVIDER,
+				connectionProvider
+		);
+		return config;
+	}
+
+	@Override
+	public void buildEntityManagerFactory() throws Exception {
+		connectionProvider = new PreparedStatementSpyConnectionProvider();
+		super.buildEntityManagerFactory();
+	}
+
+	@Override
+	public void releaseResources() {
+		super.releaseResources();
+		connectionProvider.stop();
+	}
+
+	@Override
+	protected Class<?>[] getAnnotatedClasses() {
+		return new Class[] {
+				Order.class,
+				Product.class,
+				Tag.class,
+		};
+	}
+
+	@Test
+	@TestForIssue(jiraKey = "HHH-10485")
+	public void testWithoutEntityGraph() {
+
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
+			CriteriaQuery<Order> criteriaQuery = criteriaBuilder
+				.createQuery( Order.class );
+			criteriaQuery.from( Order.class );
+
+			connectionProvider.clear();
+
+			entityManager
+				.createQuery( criteriaQuery )
+				.setFirstResult( 10 )
+				.setMaxResults( 20 )
+				.getResultList();
+
+			assertFalse( connectionProvider.getPreparedSQLStatements().get( 0 ).toLowerCase().contains( "left outer join" ) );
+		} );
+	}
+
+	@Test
+	@TestForIssue(jiraKey = "HHH-10485")
+	public void testWithEntityGraph() {
+
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
+			CriteriaQuery<Order> criteriaQuery = criteriaBuilder
+				.createQuery( Order.class );
+			criteriaQuery.from( Order.class );
+
+			EntityGraph<Order> entityGraph = entityManager.createEntityGraph( Order.class );
+			entityGraph.addAttributeNodes( "products" );
+
+			connectionProvider.clear();
+
+			entityManager
+				.createQuery( criteriaQuery )
+				.setFirstResult( 10 )
+				.setMaxResults( 20 )
+				.setHint( QueryHints.HINT_FETCHGRAPH, entityGraph )
+				.getResultList();
+
+			assertTrue( connectionProvider.getPreparedSQLStatements().get( 0 ).toLowerCase().contains( "left outer join" ) );
+		} );
+	}
+
+	@Entity(name = "Order")
+	@Table(name = "orders")
+	public static class Order {
+
+		@Id
+		@GeneratedValue
+		private long id;
+
+		@OneToMany
+		@Fetch(FetchMode.SELECT)
+		private List<Product> products;
+
+		@OneToMany
+		@Fetch(FetchMode.SELECT)
+		private List<Tag> tags;
+
+		public long getId() {
+			return this.id;
+		}
+
+		public void setId(long id) {
+			this.id = id;
+		}
+
+		public List<Product> getProducts() {
+			return this.products;
+		}
+
+		public void setProducts(List<Product> products) {
+			this.products = products;
+		}
+
+		public List<Tag> getTags() {
+			return this.tags;
+		}
+
+		public void setTags(List<Tag> tags) {
+			this.tags = tags;
+		}
+
+	}
+
+	@Entity(name = "Product")
+	@Table(name = "products")
+	public static class Product {
+
+		@Id
+		@GeneratedValue
+		private long id;
+
+		private String name;
+
+		public long getId() {
+			return this.id;
+		}
+
+		public void setId(long id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+	}
+
+	@Entity(name = "Tag")
+	@Table(name = "tags")
+	public static class Tag {
+
+		@Id
+		@GeneratedValue
+		private long id;
+
+		private String name;
+
+		public long getId() {
+			return this.id;
+		}
+
+		public void setId(long id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+	}
+}

hibernate-core/src/test/java/org/hibernate/test/util/jdbc/PreparedStatementSpyConnectionProvider.java

@@ -116,6 +116,8 @@ public class PreparedStatementSpyConnectionProvider
 		releasedConnections.clear();
 		preparedStatementMap.keySet().forEach( Mockito::reset );
 		preparedStatementMap.clear();
+		executeStatements.clear();
+		executeUpdateStatements.clear();
 	}
 
 	/**
@@ -164,6 +166,15 @@ public class PreparedStatementSpyConnectionProvider
 		return new ArrayList<>( preparedStatementMap.keySet() );
 	}
 
+	/**
+	 * Get the PreparedStatements SQL statements.
+	 *
+	 * @return list of recorded PreparedStatements SQL statements.
+	 */
+	public List<String> getPreparedSQLStatements() {
+		return new ArrayList<>( preparedStatementMap.values() );
+	}
+
 	/**
 	 * Get the SQL statements that were executed since the last clear operation.
 	 * @return list of recorded update statements.