Skip to content

Commit d42375f

Browse files
author
Houssam El Mansouri
committed
Add support for Hibernate's hibernate.hbm2ddl.extra_physical_table_types
1 parent 208a869 commit d42375f

File tree

4 files changed

+50
-1
lines changed

4 files changed

+50
-1
lines changed

extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/properties/ConfigPropertiesTest.java

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@
22

33
import static org.assertj.core.api.Assertions.assertThat;
44

5+
import java.util.List;
6+
57
import jakarta.inject.Inject;
68
import jakarta.transaction.Transactional;
79

810
import org.hibernate.FlushMode;
911
import org.hibernate.Session;
12+
import org.hibernate.cfg.AvailableSettings;
1013
import org.jboss.shrinkwrap.api.ShrinkWrap;
1114
import org.jboss.shrinkwrap.api.spec.JavaArchive;
1215
import org.junit.jupiter.api.Test;
@@ -32,7 +35,9 @@ public class ConfigPropertiesTest {
3235
.overrideConfigKey("quarkus.hibernate-orm.\"overrides\".packages", MyEntityForOverridesPU.class.getPackageName())
3336
.overrideConfigKey("quarkus.hibernate-orm.\"overrides\".datasource", "<default>")
3437
// Overrides to test that Quarkus configuration properties are taken into account
35-
.overrideConfigKey("quarkus.hibernate-orm.\"overrides\".flush.mode", "always");
38+
.overrideConfigKey("quarkus.hibernate-orm.\"overrides\".flush.mode", "always")
39+
.overrideConfigKey("quarkus.hibernate-orm.\"overrides\".database.extra-physical-table-types",
40+
"MATERIALIZED VIEW,FOREIGN TABLE");
3641

3742
@Inject
3843
Session sessionForDefaultPU;
@@ -48,4 +53,19 @@ public void propertiesAffectingSession() {
4853
assertThat(sessionForOverridesPU.getHibernateFlushMode()).isEqualTo(FlushMode.ALWAYS);
4954
}
5055

56+
@Test
57+
@Transactional
58+
public void extraPhysicalTableTypes() {
59+
Object extraPhysicalTableTypes = sessionForOverridesPU.getProperties()
60+
.get(AvailableSettings.EXTRA_PHYSICAL_TABLE_TYPES);
61+
62+
assertThat(extraPhysicalTableTypes).isNotNull();
63+
assertThat(extraPhysicalTableTypes).isInstanceOf(List.class);
64+
65+
@SuppressWarnings("unchecked")
66+
List<String> tableTypes = (List<String>) extraPhysicalTableTypes;
67+
68+
assertThat(tableTypes).containsExactly("MATERIALIZED VIEW", "FOREIGN TABLE");
69+
}
70+
5171
}

extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/FastBootHibernatePersistenceProvider.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,13 @@ private static void injectRuntimeConfiguration(HibernateOrmRuntimeConfigPersiste
483483
"When using offline mode with `quarkus.hibernate-orm.database.start-offline=true`, the schema management strategy `quarkus.hibernate-orm.schema-management.strategy` must be unset or set to `none`");
484484
}
485485

486+
// Pass extraPhysicalTableTypes configuration
487+
List<String> extraPhysicalTableTypes = persistenceUnitConfig.schemaManagement().extraPhysicalTableTypes();
488+
if (extraPhysicalTableTypes != null && !extraPhysicalTableTypes.isEmpty()) {
489+
String extraTableTypesStr = String.join(",", extraPhysicalTableTypes);
490+
runtimeSettingsBuilder.put(AvailableSettings.EXTRA_PHYSICAL_TABLE_TYPES, extraTableTypesStr);
491+
}
492+
486493
runtimeSettingsBuilder.put(AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION,
487494
persistenceUnitConfig.database().generation().generation()
488495
.orElse(generationStrategy));

extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.quarkus.hibernate.orm.runtime;
22

3+
import java.util.List;
34
import java.util.Map;
45
import java.util.Optional;
56

@@ -172,6 +173,20 @@ interface HibernateOrmConfigPersistenceUnitSchemaManagement {
172173
*/
173174
@WithDefault("false")
174175
boolean haltOnError();
176+
177+
/**
178+
* Additional database object types to include in schema management operations.
179+
*
180+
* By default, Hibernate ORM only considers tables and sequences when performing
181+
* schema management operations.
182+
* This setting allows you to specify additional database object types that should be included,
183+
* such as "MATERIALIZED VIEW", "VIEW", or other database-specific object types.
184+
*
185+
* The exact supported values depend on the underlying database and dialect.
186+
*
187+
* @asciidoclet
188+
*/
189+
List<@WithConverter(TrimmedStringConverter.class) String> extraPhysicalTableTypes();
175190
}
176191

177192
@ConfigGroup

extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/FastBootHibernateReactivePersistenceProvider.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,13 @@ private static void injectRuntimeConfiguration(HibernateOrmRuntimeConfigPersiste
392392
"When using offline mode with `quarkus.hibernate-orm.database.start-offline=true`, the schema management strategy `quarkus.hibernate-orm.schema-management.strategy` must be unset or set to `none`");
393393
}
394394

395+
// Pass extraPhysicalTableTypes configuration
396+
List<String> extraPhysicalTableTypes = persistenceUnitConfig.schemaManagement().extraPhysicalTableTypes();
397+
if (extraPhysicalTableTypes != null && !extraPhysicalTableTypes.isEmpty()) {
398+
String extraTableTypesStr = String.join(",", extraPhysicalTableTypes);
399+
runtimeSettingsBuilder.put(AvailableSettings.EXTRA_PHYSICAL_TABLE_TYPES, extraTableTypesStr);
400+
}
401+
395402
// Database
396403
runtimeSettingsBuilder.put(AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION,
397404
persistenceUnitConfig.database().generation().generation()

0 commit comments

Comments
 (0)