HHH-10208 - Index and unique-key constraints not properly handled wit…

…h implicit columns in hbm.xml binding

hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java

@@ -19,7 +19,6 @@
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
 import javax.persistence.Embeddable;
 import javax.persistence.Entity;
 import javax.persistence.MapsId;
@@ -45,11 +44,9 @@
 import org.hibernate.boot.model.relational.Database;
 import org.hibernate.boot.model.relational.ExportableProducer;
 import org.hibernate.boot.model.relational.Namespace;
-import org.hibernate.boot.model.source.internal.ConstraintSecondPass;
 import org.hibernate.boot.model.source.internal.ImplicitColumnNamingSecondPass;
 import org.hibernate.boot.model.source.spi.LocalMetadataBuildingContext;
 import org.hibernate.boot.spi.AttributeConverterAutoApplyHandler;
-import org.hibernate.boot.spi.AttributeConverterDescriptor;
 import org.hibernate.boot.spi.InFlightMetadataCollector;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.boot.spi.MetadataBuildingOptions;
@@ -1452,7 +1449,6 @@ public Join locateJoin(Identifier tableName) {
 	private ArrayList<CreateKeySecondPass> createKeySecondPasList;
 	private ArrayList<SecondaryTableSecondPass> secondaryTableSecondPassList;
 	private ArrayList<QuerySecondPass> querySecondPassList;
-	private ArrayList<ConstraintSecondPass> constraintSecondPassList;
 	private ArrayList<ImplicitColumnNamingSecondPass> implicitColumnNamingSecondPassList;
 
 	private ArrayList<SecondPass> generalSecondPassList;
@@ -1485,9 +1481,6 @@ else if ( secondPass instanceof SecondaryTableSecondPass ) {
 		else if ( secondPass instanceof QuerySecondPass ) {
 			addQuerySecondPass( (QuerySecondPass) secondPass, onTopOfTheQueue );
 		}
-		else if ( secondPass instanceof ConstraintSecondPass ) {
-			addConstraintSecondPass( ( ConstraintSecondPass) secondPass, onTopOfTheQueue );
-		}
 		else if ( secondPass instanceof ImplicitColumnNamingSecondPass ) {
 			addImplicitColumnNamingSecondPass( (ImplicitColumnNamingSecondPass) secondPass );
 		}
@@ -1562,13 +1555,6 @@ private void addQuerySecondPass(QuerySecondPass secondPass, boolean onTopOfTheQu
 		addSecondPass( secondPass, querySecondPassList, onTopOfTheQueue );
 	}
 
-	private void addConstraintSecondPass(ConstraintSecondPass secondPass, boolean onTopOfTheQueue) {
-		if ( constraintSecondPassList == null ) {
-			constraintSecondPassList = new ArrayList<ConstraintSecondPass>();
-		}
-		addSecondPass( secondPass, constraintSecondPassList, onTopOfTheQueue );
-	}
-
 	private void addImplicitColumnNamingSecondPass(ImplicitColumnNamingSecondPass secondPass) {
 		if ( implicitColumnNamingSecondPassList == null ) {
 			implicitColumnNamingSecondPassList = new ArrayList<ImplicitColumnNamingSecondPass>();
@@ -1605,7 +1591,6 @@ public void processSecondPasses(MetadataBuildingContext buildingContext) {
 
 			secondPassCompileForeignKeys( buildingContext );
 
-			processSecondPasses( constraintSecondPassList );
 			processUniqueConstraintHolders( buildingContext );
 			processJPAIndexHolders( buildingContext );
 

hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractEntitySourceImpl.java

@@ -33,7 +33,6 @@
 import org.hibernate.boot.model.source.spi.AttributeRole;
 import org.hibernate.boot.model.source.spi.AttributeSource;
 import org.hibernate.boot.model.source.spi.AttributeSourceContainer;
-import org.hibernate.boot.model.source.spi.ConstraintSource;
 import org.hibernate.boot.model.source.spi.EntityHierarchySource;
 import org.hibernate.boot.model.source.spi.EntityNamingSource;
 import org.hibernate.boot.model.source.spi.EntitySource;
@@ -79,9 +78,6 @@ public abstract class AbstractEntitySourceImpl
 
 	private final ToolingHintContext toolingHintContext;
 
-	private Map<String, ConstraintSource> constraintMap = new HashMap<String, ConstraintSource>();
-
-
 	protected AbstractEntitySourceImpl(MappingDocument sourceMappingDocument, JaxbHbmEntityBaseDefinition jaxbEntityMapping) {
 		super( sourceMappingDocument );
 		this.jaxbEntityMapping = jaxbEntityMapping;
@@ -223,86 +219,12 @@ public AttributeSourceContainer getAttributeSourceContainer() {
 			public void addAttributeSource(AttributeSource attributeSource) {
 				attributeSources.add( attributeSource );
 			}
-
-			@Override
-			public void registerIndexColumn(String constraintName, String logicalTableName, String columnName) {
-				registerIndexConstraintColumn( constraintName, logicalTableName, columnName );
-			}
-
-			@Override
-			public void registerUniqueKeyColumn(String constraintName, String logicalTableName, String columnName) {
-				registerUniqueKeyConstraintColumn( constraintName, logicalTableName, columnName );
-			}
 		};
 		buildAttributeSources( attributeBuildingCallback );
 
 		return attributeSources;
 	}
 
-	private void registerIndexConstraintColumn(String constraintName, String logicalTableName, String columnName) {
-		getOrCreateIndexConstraintSource( constraintName, logicalTableName ).addColumnName( columnName );
-	}
-
-	private IndexConstraintSourceImpl getOrCreateIndexConstraintSource(String constraintName, String logicalTableName) {
-		IndexConstraintSourceImpl constraintSource = (IndexConstraintSourceImpl) constraintMap.get( constraintName );
-		if ( constraintSource == null ) {
-			constraintSource = new IndexConstraintSourceImpl( constraintName, logicalTableName );
-			constraintMap.put( constraintName, constraintSource );
-		}
-		else {
-			// make sure we have the same table name...
-			if ( !EqualsHelper.equals( constraintSource.getTableName(), logicalTableName ) ) {
-				throw new MappingException(
-						String.format(
-								Locale.ENGLISH,
-								"Named relational index [%s] referenced more than one table [%s, %s]",
-								constraintName,
-								constraintSource.getTableName() == null
-										? "null(implicit)"
-										: constraintSource.getTableName(),
-								logicalTableName == null
-										? "null(implicit)"
-										: logicalTableName
-						),
-						origin()
-				);
-			}
-		}
-		return constraintSource;
-	}
-
-	private void registerUniqueKeyConstraintColumn(String constraintName, String logicalTableName, String columnName) {
-		getOrCreateUniqueKeyConstraintSource( constraintName, logicalTableName ).addColumnName( columnName );
-	}
-
-	private UniqueKeyConstraintSourceImpl getOrCreateUniqueKeyConstraintSource(String constraintName, String logicalTableName) {
-		UniqueKeyConstraintSourceImpl constraintSource = (UniqueKeyConstraintSourceImpl) constraintMap.get( constraintName );
-		if ( constraintSource == null ) {
-			constraintSource = new UniqueKeyConstraintSourceImpl( constraintName, logicalTableName );
-			constraintMap.put( constraintName, constraintSource );
-		}
-		else {
-			// make sure we have the same table name...
-			if ( !EqualsHelper.equals( constraintSource.getTableName(), logicalTableName ) ) {
-				throw new MappingException(
-						String.format(
-								Locale.ENGLISH,
-								"Named relational unique-key [%s] referenced more than one table [%s, %s]",
-								constraintName,
-								constraintSource.getTableName() == null
-										? "null(implicit)"
-										: constraintSource.getTableName(),
-								logicalTableName == null
-										? "null(implicit)"
-										: logicalTableName
-						),
-						origin()
-				);
-			}
-		}
-		return constraintSource;
-	}
-
 	protected void buildAttributeSources(AttributesHelper.Callback attributeBuildingCallback) {
 		AttributesHelper.processAttributes(
 				sourceMappingDocument(),
@@ -344,22 +266,6 @@ public AttributeSourceContainer getAttributeSourceContainer() {
 						public void addAttributeSource(AttributeSource attributeSource) {
 							attributeSources.add( attributeSource );
 						}
-
-						@Override
-						public void registerIndexColumn(
-								String constraintName,
-								String logicalTableName,
-								String columnName) {
-							registerIndexConstraintColumn( constraintName, logicalTableName, columnName );
-						}
-
-						@Override
-						public void registerUniqueKeyColumn(
-								String constraintName,
-								String logicalTableName,
-								String columnName) {
-							registerUniqueKeyConstraintColumn( constraintName, logicalTableName, columnName );
-						}
 					},
 					joinElement.getAttributes(),
 					logicalTableName,
@@ -501,11 +407,6 @@ void add(SubclassEntitySourceImpl subclassEntitySource) {
 		subclassEntitySources.add( subclassEntitySource );
 	}
 
-	@Override
-	public Collection<ConstraintSource> getConstraints() {
-		return constraintMap.values();
-	}
-
 	@Override
 	public Map<String,SecondaryTableSource> getSecondaryTableMap() {
 		return secondaryTableMap;

hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractSingularAttributeSourceEmbeddedImpl.java

@@ -72,20 +72,6 @@ public AttributePath getAttributePathBase() {
 							public ToolingHintContext getToolingHintContextBaselineForEmbeddable() {
 								return toolingHintContext;
 							}
-
-							@Override
-							public void registerIndexConstraintColumn(
-									String constraintName,
-									String logicalTableName,
-									String columnName) {
-
-							}
-
-							@Override
-							public void registerUniqueKeyConstraintColumn(
-									String constraintName, String logicalTableName, String columnName) {
-
-							}
 						},
 						embeddedAttributeMapping.getEmbeddableMapping(),
 						nestedAttributeMappings,