Add support for Hibernate's hibernate.hbm2ddl.extra_physical_table_types

Author: Houssam El Mansouri

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

@@ -2,11 +2,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.List;
+
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
 
 import org.hibernate.FlushMode;
 import org.hibernate.Session;
+import org.hibernate.cfg.AvailableSettings;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
@@ -32,7 +35,9 @@ public class ConfigPropertiesTest {
             .overrideConfigKey("quarkus.hibernate-orm.\"overrides\".packages", MyEntityForOverridesPU.class.getPackageName())
             .overrideConfigKey("quarkus.hibernate-orm.\"overrides\".datasource", "<default>")
             // Overrides to test that Quarkus configuration properties are taken into account
-            .overrideConfigKey("quarkus.hibernate-orm.\"overrides\".flush.mode", "always");
+            .overrideConfigKey("quarkus.hibernate-orm.\"overrides\".flush.mode", "always")
+            .overrideConfigKey("quarkus.hibernate-orm.\"overrides\".database.extra-physical-table-types",
+                    "MATERIALIZED VIEW,FOREIGN TABLE");
 
     @Inject
     Session sessionForDefaultPU;
@@ -48,4 +53,19 @@ public void propertiesAffectingSession() {
         assertThat(sessionForOverridesPU.getHibernateFlushMode()).isEqualTo(FlushMode.ALWAYS);
     }
 
+    @Test
+    @Transactional
+    public void extraPhysicalTableTypes() {
+        Object extraPhysicalTableTypes = sessionForOverridesPU.getProperties()
+                .get(AvailableSettings.EXTRA_PHYSICAL_TABLE_TYPES);
+
+        assertThat(extraPhysicalTableTypes).isNotNull();
+        assertThat(extraPhysicalTableTypes).isInstanceOf(List.class);
+
+        @SuppressWarnings("unchecked")
+        List<String> tableTypes = (List<String>) extraPhysicalTableTypes;
+
+        assertThat(tableTypes).containsExactly("MATERIALIZED VIEW", "FOREIGN TABLE");
+    }
+
 }

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

@@ -483,6 +483,13 @@ private static void injectRuntimeConfiguration(HibernateOrmRuntimeConfigPersiste
                     "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`");
         }
 
+        // Pass extraPhysicalTableTypes configuration
+        List<String> extraPhysicalTableTypes = persistenceUnitConfig.schemaManagement().extraPhysicalTableTypes();
+        if (extraPhysicalTableTypes != null && !extraPhysicalTableTypes.isEmpty()) {
+            String extraTableTypesStr = String.join(",", extraPhysicalTableTypes);
+            runtimeSettingsBuilder.put(AvailableSettings.EXTRA_PHYSICAL_TABLE_TYPES, extraTableTypesStr);
+        }
+
         runtimeSettingsBuilder.put(AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION,
                 persistenceUnitConfig.database().generation().generation()
                         .orElse(generationStrategy));

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

@@ -1,5 +1,6 @@
 package io.quarkus.hibernate.orm.runtime;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
@@ -172,6 +173,20 @@ interface HibernateOrmConfigPersistenceUnitSchemaManagement {
          */
         @WithDefault("false")
         boolean haltOnError();
+
+        /**
+         * Additional database object types to include in schema management operations.
+         *
+         * By default, Hibernate ORM only considers tables and sequences when performing
+         * schema management operations.
+         * This setting allows you to specify additional database object types that should be included,
+         * such as "MATERIALIZED VIEW", "VIEW", or other database-specific object types.
+         *
+         * The exact supported values depend on the underlying database and dialect.
+         *
+         * @asciidoclet
+         */
+        List<@WithConverter(TrimmedStringConverter.class) String> extraPhysicalTableTypes();
     }
 
     @ConfigGroup

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

@@ -383,6 +383,13 @@ private static void injectRuntimeConfiguration(HibernateOrmRuntimeConfigPersiste
                     "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`");
         }
 
+        // Pass extraPhysicalTableTypes configuration
+        List<String> extraPhysicalTableTypes = persistenceUnitConfig.schemaManagement().extraPhysicalTableTypes();
+        if (extraPhysicalTableTypes != null && !extraPhysicalTableTypes.isEmpty()) {
+            String extraTableTypesStr = String.join(",", extraPhysicalTableTypes);
+            runtimeSettingsBuilder.put(AvailableSettings.EXTRA_PHYSICAL_TABLE_TYPES, extraTableTypesStr);
+        }
+
         // Database
         runtimeSettingsBuilder.put(AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION,
                 persistenceUnitConfig.database().generation().generation()

extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/DevServicesKubernetesProcessor.java

@@ -184,8 +184,8 @@ public void applyManifests(
             KubernetesDevServiceInfoBuildItem kubernetesDevServiceInfoBuildItem,
             KubernetesClientBuildConfig kubernetesClientBuildTimeConfig) {
         if (kubernetesDevServiceInfoBuildItem == null) {
-            // Gracefully return in case the Kubernetes dev service could not be spun up.
-            log.warn("Cannot apply manifests because the Kubernetes dev service is not running");
+            // Gracefully return in case the Kubernetes dev service could not be found
+            log.error("Cannot apply manifests because the Kubernetes dev service is not running");
             return;
         }
 
@@ -367,6 +367,13 @@ private RunningDevService startKubernetes(DockerStatusBuildItem dockerStatusBuil
                     getKubernetesClientConfigFromKubeConfig(kubeConfig));
         };
 
+        maybeContainerAddress.ifPresent(containerAddress -> {
+            devServicesKube
+                    .produce(new KubernetesDevServiceInfoBuildItem(
+                            KubeConfigUtils.serializeKubeConfig(getKubeconfigFromRunningContainer(containerAddress)),
+                            containerAddress.getId()));
+        });
+
         return maybeContainerAddress
                 .map(containerAddress -> new RunningDevService(Feature.KUBERNETES_CLIENT.getName(),
                         containerAddress.getId(),
@@ -425,6 +432,13 @@ private Map<String, String> resolveConfigurationFromRunningContainer(ContainerAd
         return container.getKubeconfig();
     }
 
+    private KubeConfig getKubeconfigFromRunningContainer(ContainerAddress containerAddress) {
+        var dockerClient = DockerClientFactory.lazyClient();
+        var container = new RunningContainer(dockerClient, containerAddress);
+
+        return container.getKubeconfigFromContainer();
+    }
+
     private KubernetesDevServiceCfg getConfiguration(KubernetesClientBuildConfig cfg) {
         KubernetesDevServicesBuildTimeConfig devServicesConfig = cfg.devservices();
         return new KubernetesDevServiceCfg(devServicesConfig);
@@ -496,19 +510,19 @@ public RunningContainer(DockerClient dockerClient, ContainerAddress containerAdd
             this.containerInfo = dockerClient.inspectContainerCmd(getContainerId()).exec();
         }
 
-        public Map<String, String> getKubeconfig() {
+        private KubeConfig getKubeconfigFromContainer() {
             var image = getContainerInfo().getConfig().getImage();
             if (image.contains("rancher/k3s")) {
-                return getKubernetesClientConfigFromKubeConfig(
-                        KubeConfigUtils.parseKubeConfig(KubeConfigUtils.replaceServerInKubeconfig(containerAddress.getUrl(),
-                                getFileContentFromContainer(K3S_KUBECONFIG))));
+                return KubeConfigUtils
+                        .parseKubeConfig(KubeConfigUtils.replaceServerInKubeconfig("https://" + containerAddress.getUrl(),
+                                getFileContentFromContainer(K3S_KUBECONFIG)));
             } else if (image.contains("kindest/node")) {
-                return getKubernetesClientConfigFromKubeConfig(
-                        KubeConfigUtils.parseKubeConfig(KubeConfigUtils.replaceServerInKubeconfig(containerAddress.getUrl(),
-                                getFileContentFromContainer(KIND_KUBECONFIG))));
+                return KubeConfigUtils
+                        .parseKubeConfig(KubeConfigUtils.replaceServerInKubeconfig("https://" + containerAddress.getUrl(),
+                                getFileContentFromContainer(KIND_KUBECONFIG)));
             } else if (image.contains("k8s.gcr.io/kube-apiserver") ||
                     image.contains("registry.k8s.io/kube-apiserver")) {
-                return getKubernetesClientConfigFromKubeConfig(getKubeconfigFromApiContainer(containerAddress.getUrl()));
+                return getKubeconfigFromApiContainer(containerAddress.getUrl());
             }
 
             // this can happen only if the user manually start
@@ -517,6 +531,10 @@ public Map<String, String> getKubeconfig() {
                     + "' is not compatible with Dev Services for Kubernetes. Stop it or disable Dev Services for Kubernetes.");
         }
 
+        public Map<String, String> getKubeconfig() {
+            return getKubernetesClientConfigFromKubeConfig(getKubeconfigFromContainer());
+        }
+
         protected KubeConfig getKubeconfigFromApiContainer(final String url) {
             final Cluster cluster = new Cluster();
             cluster.setName(APISERVER);