HHH-7406 - Wrong SQL in Joined inheritance if subclasses have fields with same name

- Add test case
2017-03-04 03:29:47 +01:00 · 2017-03-04 03:29:47 +01:00 · c088b2fa31
parent f0cbaef2cd
commit c088b2fa31
1 changed files with 137 additions and 0 deletions
--- a/hibernate-core/src/test/java/org/hibernate/test/inheritance/relationship/JoinedInheritancePropertyNameConflictTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/inheritance/relationship/JoinedInheritancePropertyNameConflictTest.java
@ -0,0 +1,137 @@
+/*
+ * 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.test.inheritance.relationship;
+
+import java.util.List;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.Table;
+
+import org.hibernate.testing.FailureExpected;
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+import org.junit.Test;
+
+import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Christian Beikov
+ */
+@TestForIssue( jiraKey = "HHH-7406")
+public class JoinedInheritancePropertyNameConflictTest extends BaseCoreFunctionalTestCase {
+
+	@Override
+	protected Class<?>[] getAnnotatedClasses() {
+		return new Class[] {
+				Country.class,
+				Town.class,
+				Mountain.class,
+				Place.class
+		};
+	}
+
+	@Test
+	@FailureExpected( jiraKey = "HHH-7406" )
+	public void testQueryConflictingPropertyName() {
+		doInHibernate( this::sessionFactory, session -> {
+			Town town = new Town( 1L, "London", 5000000 );
+			Country country = new Country( 2L, "Andorra", 10000 );
+			Mountain mountain = new Mountain( 3L, "Mont Blanc", 4810 );
+			session.persist( town );
+			session.persist( country );
+			session.persist( mountain );
+		} );
+		doInHibernate( this::sessionFactory, session -> {
+			List<Place> places = session.createQuery(
+				"select pl from " + Place.class.getName() + " pl " +
+				" where pl.population > 1000" )
+			.getResultList();
+
+			//Expected list of length 2. Expected London and Andorra
+			assertEquals( 2L, places.size() );
+		} );
+	}
+
+	@Entity
+	@Table(name = "PLACE")
+	@Inheritance(strategy = InheritanceType.JOINED)
+	public static abstract class Place {
+
+		@Id
+		@Column(name = "PLACE_ID")
+		private Long id;
+
+		@Column(name = "PLACE_NAME")
+		private String name;
+
+		protected Place() {
+		}
+
+		protected Place(Long id, String name) {
+			super();
+			this.id = id;
+			this.name = name;
+		}
+	}
+
+	@Entity
+	@Table(name = "COUNTRY")
+	@PrimaryKeyJoinColumn(name = "PLACE_ID", referencedColumnName = "PLACE_ID")
+	public static class Country extends Place {
+
+		@Column(name = "NU_POPULATION")
+		private Integer population;
+
+		public Country() {
+		}
+
+		public Country(Long id, String name, Integer population) {
+			super( id, name );
+			this.population = population;
+		}
+	}
+
+	@Entity
+	@Table(name = "MOUNTAIN")
+	@PrimaryKeyJoinColumn(name = "PLACE_ID", referencedColumnName = "PLACE_ID")
+	public static class Mountain extends Place {
+
+		@Column(name = "NU_HEIGHT")
+		private Integer height;
+
+		public Mountain() {
+		}
+
+		public Mountain(Long id, String name, Integer height) {
+			super( id, name );
+			this.height = height;
+		}
+	}
+
+	@Entity
+	@Table(name = "TOWN")
+	@PrimaryKeyJoinColumn(name = "PLACE_ID", referencedColumnName = "PLACE_ID")
+	public static class Town extends Place {
+
+		@Column(name = "NU_POPULATION")
+		private Integer population;
+
+		public Town() {
+		}
+
+		public Town(Long id, String name, Integer population) {
+			super( id, name );
+			this.population = population;
+		}
+	}
+}
+