Hibernate ORM DevUI - Fix import file not being appended to DDL schema

The import file name was not correctly handed over to the SchemaExport utility.
quarkusio · Aug 10, 2021 · 66e1b37 · 66e1b37
1 parent 591c0de
commit 66e1b37
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.../java/io/quarkus/hibernate/orm/runtime/devconsole/HibernateOrmDevConsoleInfoSupplier.java b/.../java/io/quarkus/hibernate/orm/runtime/devconsole/HibernateOrmDevConsoleInfoSupplier.java
@@ -31,13 +31,13 @@ public PersistenceUnitsInfo get() {
     }
 
     public static void pushPersistenceUnit(String persistenceUnitName,
-            Metadata metadata, ServiceRegistry serviceRegistry) {
+            Metadata metadata, ServiceRegistry serviceRegistry, String importFile) {
         INSTANCE.getPersistenceUnits().add(persistenceUnitName);
 
-        String createSchema = generateDDL(SchemaExport.Action.CREATE, metadata, serviceRegistry);
+        String createSchema = generateDDL(SchemaExport.Action.CREATE, metadata, serviceRegistry, importFile);
         INSTANCE.createDDLs.put(persistenceUnitName, createSchema);
 
-        String dropSchema = generateDDL(SchemaExport.Action.DROP, metadata, serviceRegistry);
+        String dropSchema = generateDDL(SchemaExport.Action.DROP, metadata, serviceRegistry, importFile);
         INSTANCE.dropDDLs.put(persistenceUnitName, dropSchema);
 
         for (PersistentClass entityBinding : metadata.getEntityBindings()) {
@@ -60,10 +60,12 @@ public static void pushPersistenceUnit(String persistenceUnitName,
         }
     }
 
-    private static String generateDDL(SchemaExport.Action action, Metadata metadata, ServiceRegistry serviceRegistry) {
+    private static String generateDDL(SchemaExport.Action action, Metadata metadata, ServiceRegistry serviceRegistry,
+            String importFiles) {
         SchemaExport schemaExport = new SchemaExport();
         schemaExport.setFormat(true);
         schemaExport.setDelimiter(";");
+        schemaExport.setImportFiles(importFiles);
         StringWriter writer = new StringWriter();
         schemaExport.doExecution(action, false, metadata, serviceRegistry,
                 new TargetDescriptor() {

diff --git a/...in/java/io/quarkus/hibernate/orm/runtime/devconsole/HibernateOrmDevConsoleIntegrator.java b/...in/java/io/quarkus/hibernate/orm/runtime/devconsole/HibernateOrmDevConsoleIntegrator.java
@@ -1,5 +1,7 @@
 package io.quarkus.hibernate.orm.runtime.devconsole;
 
+import static org.hibernate.cfg.AvailableSettings.HBM2DDL_IMPORT_FILES;
+
 import org.hibernate.boot.Metadata;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.integrator.spi.Integrator;
@@ -12,7 +14,8 @@ public void integrate(Metadata metadata, SessionFactoryImplementor sessionFactor
             SessionFactoryServiceRegistry sessionFactoryServiceRegistry) {
         HibernateOrmDevConsoleInfoSupplier.pushPersistenceUnit(
                 (String) sessionFactoryImplementor.getProperties().get(AvailableSettings.PERSISTENCE_UNIT_NAME),
-                metadata, sessionFactoryServiceRegistry);
+                metadata, sessionFactoryServiceRegistry,
+                (String) sessionFactoryImplementor.getProperties().get(HBM2DDL_IMPORT_FILES));
     }
 
     @Override