HHH-8275 union-subclass generates bad alter table for unique constraint

hibernate · Jul 8, 2013 · 80938a6 · 80938a6
1 parent 804418b
commit 80938a6
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/DenormalizedTable.java b/hibernate-core/src/main/java/org/hibernate/mapping/DenormalizedTable.java
@@ -87,14 +87,12 @@ public PrimaryKey getPrimaryKey() {
 
 	@Override
     public Iterator getUniqueKeyIterator() {
-		//wierd implementation because of hacky behavior
-		//of Table.sqlCreateString() which modifies the
-		//list of unique keys by side-effect on some
-		//dialects
-		Map uks = new HashMap();
-		uks.putAll( getUniqueKeys() );
-		uks.putAll( includedTable.getUniqueKeys() );
-		return uks.values().iterator();
+		Iterator iter = includedTable.getUniqueKeyIterator();
+		while ( iter.hasNext() ) {
+			UniqueKey uk = (UniqueKey) iter.next();
+			createUniqueKey( uk.getColumns() );
+		}
+		return getUniqueKeys().values().iterator();
 	}
 
 	@Override