Allow setting additional Hibernate quoting options

extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java

@@ -361,9 +361,23 @@ public static class HibernateOrmConfigPersistenceUnitDatabase {
         @ConfigItem
         public boolean globallyQuotedIdentifiers;
 
+        /**
+         * Whether Hibernate should skip column definitions when global quoting is enabled.
+         */
+        @ConfigItem
+        public boolean globallyQuotedIdentifiersSkipColumnDefinitions;
+
+        /**
+         * Whether Hibernate should quote any names that are deemed keywords.
+         */
+        @ConfigItem
+        public boolean autoQuoteKeyword;
+
         public boolean isAnyPropertySet() {
             return !DEFAULT_CHARSET.equals(charset.name())
-                    || globallyQuotedIdentifiers;
+                    || globallyQuotedIdentifiers
+                    || globallyQuotedIdentifiersSkipColumnDefinitions
+                    || autoQuoteKeyword;
         }
     }
 

extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java

@@ -1047,10 +1047,20 @@ private static void producePersistenceUnitDescriptorFromConfig(
         descriptor.getProperties().setProperty(AvailableSettings.HBM2DDL_CHARSET_NAME,
                 persistenceUnitConfig.database.charset.name());
 
+        // Quoting options
         if (persistenceUnitConfig.database.globallyQuotedIdentifiers) {
             descriptor.getProperties().setProperty(AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS, "true");
         }
 
+        if (persistenceUnitConfig.database.globallyQuotedIdentifiersSkipColumnDefinitions) {
+            descriptor.getProperties().setProperty(AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS_SKIP_COLUMN_DEFINITIONS,
+                    "true");
+        }
+
+        if (persistenceUnitConfig.database.autoQuoteKeyword) {
+            descriptor.getProperties().setProperty(AvailableSettings.KEYWORD_AUTO_QUOTING_ENABLED, "true");
+        }
+
         // Query
         int batchSize = firstPresent(persistenceUnitConfig.fetch.batchSize, persistenceUnitConfig.batchFetchSize)
                 .orElse(16);

extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/quoting_options/AbstractJPAQuotedTest.java

@@ -0,0 +1,20 @@
+package io.quarkus.hibernate.orm.quoting_options;
+
+import static org.hamcrest.core.StringContains.containsString;
+
+import org.junit.jupiter.api.Test;
+
+import io.restassured.RestAssured;
+
+public abstract class AbstractJPAQuotedTest {
+
+    @Test
+    public void testQuotedIdentifiers() {
+        RestAssured.when().post("/jpa-test-quoted").then()
+                .body(containsString("ok"));
+
+        RestAssured.when().get("/jpa-test-quoted").then()
+                .body(containsString("group_name"), containsString("group_value"));
+    }
+
+}

extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/quoted_indentifiers/Group.java → extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/quoting_options/Group.java

@@ -1,15 +1,17 @@
-package io.quarkus.hibernate.orm.quoted_indentifiers;
+package io.quarkus.hibernate.orm.quoting_options;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
 /**
- * Table with reserved name.
- * <p>
- * http://www.h2database.com/html/advanced.html section "Keywords / Reserved Words".
+ * Table with reserved name and containing one column with reserved name and column definition.
+ *
+ * @see <a href="http://www.h2database.com/html/advanced.html#keywords">H2 Documentation, section
+ *      "Keywords / Reserved Words"</a>
  */
 @Entity
 @Table(name = "group")
@@ -19,6 +21,8 @@ public class Group {
 
     private String name;
 
+    private String value;
+
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "groupSeq")
     public Long getId() {
@@ -36,4 +40,13 @@ public String getName() {
     public void setName(String name) {
         this.name = name;
     }
+
+    @Column(columnDefinition = "varchar(255)")
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
 }

extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/quoting_options/JPAQuotedIdentifiersTest.java

@@ -0,0 +1,21 @@
+package io.quarkus.hibernate.orm.quoting_options;
+
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+
+/**
+ * Failed to fetch entity with reserved name and containing one column with reserved name and column definition.
+ * <p>
+ * To resolve the simulated situations, this test activates the options {@code globally-quoted-identifiers} and
+ * {@code globally-quoted-identifiers-skip-column-definitions}.
+ */
+public class JPAQuotedIdentifiersTest extends AbstractJPAQuotedTest {
+
+    @RegisterExtension
+    final static QuarkusDevModeTest TEST = new QuarkusDevModeTest()
+            .withApplicationRoot((jar) -> jar
+                    .addClasses(Group.class, QuotedResource.class)
+                    .addAsResource("application-quoted-identifiers.properties", "application.properties"));
+
+}

extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/quoting_options/JPAQuotedKeywordsTest.java

@@ -0,0 +1,20 @@
+package io.quarkus.hibernate.orm.quoting_options;
+
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+
+/**
+ * Failed to fetch entity with reserved name and containing one column with reserved name and column definition.
+ * <p>
+ * To resolve the simulated situations, this test activates the option {@code auto-quote-keyword}.
+ */
+public class JPAQuotedKeywordsTest extends AbstractJPAQuotedTest {
+
+    @RegisterExtension
+    final static QuarkusDevModeTest TEST = new QuarkusDevModeTest()
+            .withApplicationRoot((jar) -> jar
+                    .addClasses(Group.class, QuotedResource.class)
+                    .addAsResource("application-quoted-keywords.properties", "application.properties"));
+
+}

extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/quoted_indentifiers/QuotedResource.java → extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/quoting_options/QuotedResource.java

@@ -1,4 +1,4 @@
-package io.quarkus.hibernate.orm.quoted_indentifiers;
+package io.quarkus.hibernate.orm.quoting_options;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
@@ -11,7 +11,7 @@
 import javax.ws.rs.core.MediaType;
 
 /**
- * Try to fetch entity with reserved name.
+ * Try to fetch entity with reserved name and containing one column with reserved name and column definition.
  */
 @Path("/jpa-test-quoted")
 @ApplicationScoped
@@ -27,6 +27,7 @@ public String create() {
         Group group = new Group();
         group.setId(1L);
         group.setName("group_name");
+        group.setValue("group_value");
         em.merge(group);
         return "ok";
     }
@@ -36,7 +37,8 @@ public String create() {
     @Transactional
     public String selectWithQuotedEntity() {
         try {
-            return em.find(Group.class, 1L).getName();
+            var group = em.find(Group.class, 1L);
+            return group.getName() + " " + group.getValue();
         } catch (Exception e) {
             return "Unable to fetch group.";
         }

extensions/hibernate-orm/deployment/src/test/resources/application-quoted-identifiers.properties

@@ -5,3 +5,4 @@ quarkus.datasource.jdbc.url=jdbc:h2:mem:test
 quarkus.hibernate-orm.database.generation=drop-and-create
 
 quarkus.hibernate-orm.database.globally-quoted-identifiers=true
+quarkus.hibernate-orm.database.globally-quoted-identifiers-skip-column-definitions=true

extensions/hibernate-orm/deployment/src/test/resources/application-quoted-keywords.properties

@@ -0,0 +1,7 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:test
+
+#quarkus.hibernate-orm.log.sql=true
+quarkus.hibernate-orm.database.generation=drop-and-create
+
+quarkus.hibernate-orm.database.auto-quote-keyword=true

extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java

@@ -279,10 +279,19 @@ private static ParsedPersistenceXmlDescriptor generateReactivePersistenceUnit(
         desc.getProperties().setProperty(AvailableSettings.HBM2DDL_CHARSET_NAME,
                 persistenceUnitConfig.database.charset.name());
 
+        // Quoting options
         if (persistenceUnitConfig.database.globallyQuotedIdentifiers) {
             desc.getProperties().setProperty(AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS, "true");
         }
 
+        if (persistenceUnitConfig.database.globallyQuotedIdentifiersSkipColumnDefinitions) {
+            desc.getProperties().setProperty(AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS_SKIP_COLUMN_DEFINITIONS, "true");
+        }
+
+        if (persistenceUnitConfig.database.autoQuoteKeyword) {
+            desc.getProperties().setProperty(AvailableSettings.KEYWORD_AUTO_QUOTING_ENABLED, "true");
+        }
+
         // Query
         // TODO ideally we should align on ORM and use 16 as a default, but that would break applications
         //   because of https://github.com/hibernate/hibernate-reactive/issues/742