Use the lower_case_table_names flag on mariadb

Author: duanemay

server/src/main/java/org/cloudfoundry/identity/uaa/db/DatabaseInformation1_5_3.java

@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************
- *     Cloud Foundry 
+ *     Cloud Foundry
  *     Copyright (c) [2009-2016] Pivotal Software, Inc. All Rights Reserved.
  *
  *     This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -13,20 +13,18 @@
  *******************************************************************************/
 package org.cloudfoundry.identity.uaa.db;
 
+import org.springframework.jdbc.core.RowMapper;
+
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
-import org.springframework.jdbc.core.RowMapper;
-
 /**
  * Created by fhanik on 3/5/14.
  */
 public class DatabaseInformation1_5_3 {
 
-    public static List<String> tableNames = Collections.unmodifiableList(Arrays.asList(
+    public static final List<String> tableNames = List.of(
             "users",
             "sec_audit",
             "oauth_client_details",
@@ -35,8 +33,7 @@ public class DatabaseInformation1_5_3 {
             "oauth_code",
             "authz_approvals",
             "external_group_mapping"
-
-    ));
+    );
 
     public static boolean processColumn(ColumnInfo column) {
         return (!column.columnName.equals(column.columnName.toLowerCase())) &&

server/src/main/java/org/cloudfoundry/identity/uaa/db/beans/DatabaseConfiguration.java

@@ -99,15 +99,28 @@ JdbcUrlCustomizer jdbcUrlAddTimeoutCustomizer(DatabaseProperties databasePropert
     }
 
     /**
-     * Allow mariadb driver to connect to mysql scheme urls
+     * Use lower case table names with the mariadb driver
+     * and allow connection to mysql scheme urls
      */
     @Bean
     @Profile("mysql")
-    JdbcUrlCustomizer jdbcUrlAddPermitMysqlSchemeCustomizer(DatabaseProperties databaseProperties) {
+    JdbcUrlCustomizer jdbcUrlMariaDbSchemeCustomizer(DatabaseProperties databaseProperties) {
         return url -> {
-            if (databaseProperties.getDriverClassName().contains("mariadb") && url.startsWith("jdbc:mysql") && !url.contains("permitMysqlScheme=")) {
+            if (!url.startsWith("jdbc:mysql")) {
+                return url;
+            }
+            if (!databaseProperties.getDriverClassName().contains("mariadb")) {
+                return url;
+            }
+
+            // this is a mysql scheme url with the mariadb driver
+            if (!url.contains("permitMysqlScheme=")) {
+                String connectorCharacter = url.contains("?") ? "&" : "?";
+                url += connectorCharacter + "permitMysqlScheme=true";
+            }
+            if (!url.contains("lower_case_table_names")) {
                 String connectorCharacter = url.contains("?") ? "&" : "?";
-                return url + connectorCharacter + "permitMysqlScheme=true";
+                url += connectorCharacter + "lower_case_table_names=1";
             }
             return url;
         };

server/src/test/java/org/cloudfoundry/identity/uaa/db/beans/DatabasePropertiesTest.java

@@ -73,7 +73,8 @@ void dataSourceUrlConfiguration() {
             assertThat(dataSource.getUrl())
                     .containsPattern("jdbc:postgresql:uaa(_\\d+)?")
                     .containsPattern("\\?connectTimeout=10\\b")
-                    .doesNotContain("permitMysqlScheme");
+                    .doesNotContain("permitMysqlScheme")
+                    .doesNotContain("lower_case_table_names");
         }
     }
 
@@ -112,7 +113,8 @@ void dataSourceUrlConfiguration() {
                     .containsPattern("\\?useSSL=true")
                     .containsPattern("&trustServerCertificate=true")
                     .containsPattern("&connectTimeout=10000")
-                    .containsPattern("&permitMysqlScheme=true");
+                    .containsPattern("&permitMysqlScheme=true")
+                    .containsPattern("&lower_case_table_names=1");
         }
     }
 }