HHH-18406 Drop and recreate UserDefinedTypes for schema update as well

Author: mbellade

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/AbstractSchemaMigrator.java

@@ -59,6 +59,8 @@
 import static org.hibernate.internal.util.StringHelper.isEmpty;
 import static org.hibernate.tool.schema.UniqueConstraintSchemaUpdateStrategy.DROP_RECREATE_QUIETLY;
 import static org.hibernate.tool.schema.UniqueConstraintSchemaUpdateStrategy.SKIP;
+import static org.hibernate.tool.schema.internal.SchemaCreatorImpl.createUserDefinedTypes;
+import static org.hibernate.tool.schema.internal.SchemaDropperImpl.dropUserDefinedTypes;
 
 /**
  * Base implementation of {@link SchemaMigrator}.
@@ -202,6 +204,9 @@ private void performMigration(
 			}
 		}
 
+		// Drop all UDTs
+		dropUserDefinedTypes( metadata, options, schemaFilter, dialect, formatter, sqlGenerationContext, targets );
+
 		// Create before-table AuxiliaryDatabaseObjects
 		for ( AuxiliaryDatabaseObject auxiliaryDatabaseObject : database.getAuxiliaryDatabaseObjects() ) {
 			if ( auxiliaryDatabaseObject.beforeTablesOnCreation()
@@ -216,6 +221,9 @@ private void performMigration(
 			}
 		}
 
+		// Recreate all UDTs
+		createUserDefinedTypes( metadata, options, schemaFilter, dialect, formatter, sqlGenerationContext, targets );
+
 		boolean tryToCreateCatalogs = false;
 		boolean tryToCreateSchemas = false;
 		if ( options.shouldManageNamespaces() ) {

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaCreatorImpl.java

@@ -497,7 +497,7 @@ private static void createAuxiliaryObjectsBeforeTables(
 		}
 	}
 
-	private static void createUserDefinedTypes(
+	static void createUserDefinedTypes(
 			Metadata metadata,
 			ExecutionOptions options,
 			SchemaFilter schemaFilter,

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaDropperImpl.java

@@ -388,7 +388,7 @@ private static void dropTables(
 		}
 	}
 
-	private static void dropUserDefinedTypes(
+	static void dropUserDefinedTypes(
 			Metadata metadata,
 			ExecutionOptions options,
 			SchemaFilter schemaFilter,