Handle Lowercase PK Column Names (#7174)

* Handle lowercase PK column names

* Add changelog

Author: jamesagnew

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_4_0/7174-handle-lc-identifier-names.yaml

@@ -0,0 +1,6 @@
+---
+type: fix
+issue: 7174
+title: "A bug in the SQL validation logic meant that databases which are configured to
+  use lowercased identifiers incorrectly reported a database partition mode schema when
+  that setting was not in use (HAPI-2563). This has been corected."

hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/util/PartitionedIdModeVerificationSvcTest.java

@@ -30,19 +30,26 @@ class PartitionedIdModeVerificationSvcTest {
 
 	private static final String MIGRATION_TABLE_NAME = "hapi_migrator";
 
-	private DriverTypeEnum.ConnectionProperties myConnectionProperties = newConnection();
+	private DriverTypeEnum.ConnectionProperties myConnectionProperties;
 
 	@Mock
 	private HibernatePropertiesProvider myHibernatePropertiesProvider;
 
 	@ParameterizedTest
-	@CsvSource({
-		"true,  true",
-		"true,  false",
-		"false, true",
-		"false, false"
-	})
-	void testPartitionedIdDatabase_WantPartitionedIdDatabase(boolean thePartitionedIdModeForSchema, boolean thePartitionedIdModeForSettings) {
+	@CsvSource(textBlock =
+		// Partitioned Schema, Partitioned Settings, Uppercase Identifiers
+		"""
+			true,              true,                 true
+			true,              false,                true
+			false,             true,                 true
+			false,             false,                true
+			true,              true,                 false
+			false,             false,                false
+			"""
+	)
+	void testPartitionedIdDatabase_WantPartitionedIdDatabase(boolean thePartitionedIdModeForSchema, boolean thePartitionedIdModeForSettings, boolean theCapitalizedIdentifers) {
+		myConnectionProperties = newConnection(theCapitalizedIdentifers);
+
 		Set<String> commandLineValue = thePartitionedIdModeForSchema ? Set.of(HapiFhirJpaMigrationTasks.FlagEnum.DB_PARTITION_MODE.getCommandLineValue()) : Set.of();
 		HapiFhirJpaMigrationTasks tasks = new HapiFhirJpaMigrationTasks(commandLineValue);
 
@@ -73,6 +80,8 @@ void testPartitionedIdDatabase_WantPartitionedIdDatabase(boolean thePartitionedI
 	 */
 	@Test
 	void testEmptyDatabaseDoesNotFail() {
+		myConnectionProperties = newConnection(true);
+
 		PlatformTransactionManager txManager = new DataSourceTransactionManager(myConnectionProperties.getDataSource());
 		when(myHibernatePropertiesProvider.getDataSource()).thenReturn(myConnectionProperties.getDataSource());
 		when(myHibernatePropertiesProvider.getDialect()).thenReturn(new HapiFhirH2Dialect());
@@ -86,8 +95,15 @@ void testEmptyDatabaseDoesNotFail() {
 	/**
 	 * Create a new connection to a randomized H2 database for testing
 	 */
-	private DriverTypeEnum.ConnectionProperties newConnection() {
-		String url = "jdbc:h2:mem:test_migration-" + UUID.randomUUID() + ";CASE_INSENSITIVE_IDENTIFIERS=TRUE;";
+	private DriverTypeEnum.ConnectionProperties newConnection(boolean theCapitalizedIdentifiers) {
+		String url = "jdbc:h2:mem:test_migration-" + UUID.randomUUID();
+		if (theCapitalizedIdentifiers) {
+			url += ";CASE_INSENSITIVE_IDENTIFIERS=TRUE;DATABASE_TO_UPPER=TRUE;DATABASE_TO_LOWER=FALSE;";
+		} else {
+			url += ";CASE_INSENSITIVE_IDENTIFIERS=TRUE;DATABASE_TO_LOWER=TRUE;DATABASE_TO_UPPER=FALSE;";
+		}
+
+		//+ ";CASE_INSENSITIVE_IDENTIFIERS=TRUE;";
 		return DriverTypeEnum.H2_EMBEDDED.newConnectionProperties(url, "SA", "SA");
 	}
 }

hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/JdbcUtils.java

@@ -91,7 +91,7 @@ public static Set<String> getPrimaryKeyColumns(
 							metadata.getPrimaryKeys(connection.getCatalog(), connection.getSchema(), theTableName)) {
 						while (results.next()) {
 							String columnName = results.getString("COLUMN_NAME");
-							retVal.add(columnName);
+							retVal.add(columnName.toUpperCase(Locale.US));
 						}
 					}