HHH-8390 generate FK after UK

Author: brmeyer

hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java

@@ -1075,9 +1075,17 @@ public String[] generateSchemaCreationScript(Dialect dialect) throws HibernateEx
 								)
 						);
 				}
+			}
+		}
+
+		// Foreign keys must be created *after* unique keys for numerous DBs.  See HH-8390.
+		iter = getTableMappings();
+		while ( iter.hasNext() ) {
+			Table table = (Table) iter.next();
+			if ( table.isPhysicalTable() ) {
 
 				if ( dialect.hasAlterTable() ) {
-					subIter = table.getForeignKeyIterator();
+					Iterator subIter = table.getForeignKeyIterator();
 					while ( subIter.hasNext() ) {
 						ForeignKey fk = (ForeignKey) subIter.next();
 						if ( fk.isPhysicalConstraint() ) {
@@ -1215,6 +1223,33 @@ public List<SchemaUpdateScript> generateSchemaUpdateScriptList(Dialect dialect,
 					}
 				}
 
+				Iterator subIter = table.getIndexIterator();
+				while ( subIter.hasNext() ) {
+					final Index index = (Index) subIter.next();
+					// Skip if index already exists
+					if ( tableInfo != null && StringHelper.isNotEmpty( index.getName() ) ) {
+						final IndexMetadata meta = tableInfo.getIndexMetadata( index.getName() );
+						if ( meta != null ) {
+							continue;
+						}
+					}
+					scripts.add( new SchemaUpdateScript( index.sqlCreateString( dialect, mapping, tableCatalog,
+							tableSchema ), false ) );
+				}
+			}
+		}
+
+		// Foreign keys must be created *after* unique keys for numerous DBs.  See HH-8390.
+		iter = getTableMappings();
+		while ( iter.hasNext() ) {
+			Table table = (Table) iter.next();
+			String tableSchema = ( table.getSchema() == null ) ? defaultSchema : table.getSchema();
+			String tableCatalog = ( table.getCatalog() == null ) ? defaultCatalog : table.getCatalog();
+			if ( table.isPhysicalTable() ) {
+
+				TableMetadata tableInfo = databaseMetadata.getTableMetadata( table.getName(), tableSchema,
+						tableCatalog, table.isQuoted() );
+
 				if ( dialect.hasAlterTable() ) {
 					Iterator subIter = table.getForeignKeyIterator();
 					while ( subIter.hasNext() ) {
@@ -1230,20 +1265,6 @@ public List<SchemaUpdateScript> generateSchemaUpdateScriptList(Dialect dialect,
 						}
 					}
 				}
-
-				Iterator subIter = table.getIndexIterator();
-				while ( subIter.hasNext() ) {
-					final Index index = (Index) subIter.next();
-					// Skip if index already exists
-					if ( tableInfo != null && StringHelper.isNotEmpty( index.getName() ) ) {
-						final IndexMetadata meta = tableInfo.getIndexMetadata( index.getName() );
-						if ( meta != null ) {
-							continue;
-						}
-					}
-					scripts.add( new SchemaUpdateScript( index.sqlCreateString( dialect, mapping, tableCatalog,
-							tableSchema ), false ) );
-				}
 			}
 		}