Merge branch '2.2.x' into 2.3.x

Closes gh-24060

spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc

@@ -1773,10 +1773,12 @@ The fully qualified class name of the physical and the implicit strategy impleme
 Alternatively, if `ImplicitNamingStrategy` or `PhysicalNamingStrategy` beans are available in the application context, Hibernate will be automatically configured to use them.
 
 By default, Spring Boot configures the physical naming strategy with `SpringPhysicalNamingStrategy`.
-This implementation provides the same table structure as Hibernate 4: all dots are replaced by underscores and camel casing is replaced by underscores as well.
-By default, all table names are generated in lower case, but it is possible to override that flag if your schema requires it.
+This implementation provides the same table structure as Hibernate 4: all dots are replaced by underscores and camel casing is replaced by underscores as well. Additionally, by default, all table names are generated in lower case.  For example, a `TelephoneNumber` entity is mapped to the `telephone_number` table. If your schema requires mixed-case identifiers, define a custom `SpringPhysicalNamingStrategy` bean, as shown in the following example:
 
-For example, a `TelephoneNumber` entity is mapped to the `telephone_number` table.
+[source,java,indent=0]
+----
+include::{code-examples}/jpa/CaseSensitiveSpringPhysicalNamingStrategyExample.java[tag=naming-strategy]
+----
 
 If you prefer to use Hibernate 5's default instead, set the following property:
 

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/jpa/CaseSensitiveSpringPhysicalNamingStrategyExample.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2012-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.docs.jpa;
+
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
+
+import org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * Example configuration for defining a custom {@link SpringPhysicalNamingStrategy} that
+ * is case sensitive.
+ *
+ * @author Andy Wilkinson
+ */
+class CaseSensitiveSpringPhysicalNamingStrategyExample {
+
+	// tag::naming-strategy[]
+	@Bean
+	SpringPhysicalNamingStrategy caseSensitivePhysicalNamingStrategy() {
+		return new SpringPhysicalNamingStrategy() {
+
+			@Override
+			protected boolean isCaseInsensitive(JdbcEnvironment jdbcEnvironment) {
+				return false;
+			}
+
+		};
+	}
+	// end::naming-strategy[]
+
+}