Skip to content

Commit 190adcf

Browse files
author
Houssam El Mansouri
committed
Add support for Hibernate's hibernate.hbm2ddl.extra_physical_table_types
1 parent 20ff061 commit 190adcf

File tree

4 files changed

+46
-1
lines changed

4 files changed

+46
-1
lines changed

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

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ public class ConfigPropertiesTest {
3232
.overrideConfigKey("quarkus.hibernate-orm.\"overrides\".packages", MyEntityForOverridesPU.class.getPackageName())
3333
.overrideConfigKey("quarkus.hibernate-orm.\"overrides\".datasource", "<default>")
3434
// Overrides to test that Quarkus configuration properties are taken into account
35-
.overrideConfigKey("quarkus.hibernate-orm.\"overrides\".flush.mode", "always");
35+
.overrideConfigKey("quarkus.hibernate-orm.\"overrides\".flush.mode", "always")
36+
.overrideConfigKey("quarkus.hibernate-orm.\"overrides\".database.extra-physical-table-types",
37+
"MATERIALIZED VIEW,FOREIGN TABLE");
3638

3739
@Inject
3840
Session sessionForDefaultPU;
@@ -48,4 +50,19 @@ public void propertiesAffectingSession() {
4850
assertThat(sessionForOverridesPU.getHibernateFlushMode()).isEqualTo(FlushMode.ALWAYS);
4951
}
5052

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

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: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,20 @@ interface HibernateOrmConfigPersistenceUnitSchemaManagement {
172172
*/
173173
@WithDefault("false")
174174
boolean haltOnError();
175+
176+
/**
177+
* Additional database object types to include in schema management operations.
178+
*
179+
* By default, Hibernate ORM only considers tables and sequences when performing
180+
* schema management operations.
181+
* This setting allows you to specify additional database object types that should be included,
182+
* such as "MATERIALIZED VIEW", "VIEW", or other database-specific object types.
183+
*
184+
* The exact supported values depend on the underlying database and dialect.
185+
*
186+
* @asciidoclet
187+
*/
188+
List<@WithConverter(TrimmedStringConverter.class) String> extraPhysicalTableTypes();
175189
}
176190

177191
@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
@@ -383,6 +383,13 @@ private static void injectRuntimeConfiguration(HibernateOrmRuntimeConfigPersiste
383383
"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`");
384384
}
385385

386+
// Pass extraPhysicalTableTypes configuration
387+
List<String> extraPhysicalTableTypes = persistenceUnitConfig.schemaManagement().extraPhysicalTableTypes();
388+
if (extraPhysicalTableTypes != null && !extraPhysicalTableTypes.isEmpty()) {
389+
String extraTableTypesStr = String.join(",", extraPhysicalTableTypes);
390+
runtimeSettingsBuilder.put(AvailableSettings.EXTRA_PHYSICAL_TABLE_TYPES, extraTableTypesStr);
391+
}
392+
386393
// Database
387394
runtimeSettingsBuilder.put(AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION,
388395
persistenceUnitConfig.database().generation().generation()

0 commit comments

Comments
 (0)