[CONJ-574] forcing using toLowerCase/toUpperCase with Locale.ROOT whe…

…n retrieving column by name to avoid issues if current local special casing rules.
mariadb-corporation · Jan 31, 2018 · f88098f · f88098f
1 parent 08eef2b
commit f88098f
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 18 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/CallableParameterMetaData.java b/src/main/java/org/mariadb/jdbc/CallableParameterMetaData.java
@@ -56,6 +56,7 @@
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -107,7 +108,7 @@ public void readMetadataFromDbIfRequired() throws SQLException {
     }
 
     private int mapMariaDbTypeToJdbc(String str) {
-        switch (str.toUpperCase()) {
+        switch (str.toUpperCase(Locale.ROOT)) {
             case "BIT":
                 return Types.BIT;
             case "TINYINT":
@@ -246,7 +247,7 @@ private void parseParamList(boolean isFunction, String paramList) throws SQLExce
 
             callParameter.setName(matcher2.group(2).trim());
             callParameter.setSigned(matcher2.group(3) == null);
-            callParameter.setTypeName(matcher2.group(4).trim().toUpperCase());
+            callParameter.setTypeName(matcher2.group(4).trim().toUpperCase(Locale.ROOT));
 
             if (direction == null || direction.equalsIgnoreCase("IN")) {
                 callParameter.setInput(true);

diff --git a/src/main/java/org/mariadb/jdbc/UrlParser.java b/src/main/java/org/mariadb/jdbc/UrlParser.java
@@ -61,6 +61,7 @@
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -136,7 +137,7 @@ private void setInitialUrl() {
         StringBuilder sb = new StringBuilder();
         sb.append("jdbc:mariadb:");
         if (haMode != HaMode.NONE) {
-            sb.append(haMode.toString().toLowerCase()).append(":");
+            sb.append(haMode.toString().toLowerCase(Locale.ROOT)).append(":");
         }
         sb.append("//");
 
@@ -341,7 +342,7 @@ private static HaMode parseHaMode(String url, int separator) {
         }
 
         try {
-            return HaMode.valueOf(url.substring(secondColonPos + 1, thirdColonPos).toUpperCase());
+            return HaMode.valueOf(url.substring(secondColonPos + 1, thirdColonPos).toUpperCase(Locale.ROOT));
         } catch (IllegalArgumentException i) {
             throw new IllegalArgumentException("wrong failover parameter format in connection String " + url);
         }

diff --git a/src/main/java/org/mariadb/jdbc/internal/com/read/dao/ColumnNameMap.java b/src/main/java/org/mariadb/jdbc/internal/com/read/dao/ColumnNameMap.java
@@ -56,6 +56,7 @@
 
 import java.sql.SQLException;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 
@@ -77,7 +78,7 @@ public ColumnNameMap(ColumnInformation[] columnInformations) {
      */
     public int getIndex(String name) throws SQLException {
         if (name == null) throw new SQLException("Column name cannot be null");
-        String lowerName = name.toLowerCase();
+        String lowerName = name.toLowerCase(Locale.ROOT);
         // The specs in JDBC 4.0 specify that ResultSet.findColumn and
         // ResultSet.getXXX(String name) should use column alias (AS in the query). If label is not found, we use 
         // original table name.
@@ -87,12 +88,12 @@ public int getIndex(String name) throws SQLException {
             for (ColumnInformation ci : columnInfo) {
                 String columnAlias = ci.getName();
                 if (columnAlias != null && !columnAlias.isEmpty()) {
-                    columnAlias = columnAlias.toLowerCase();
+                    columnAlias = columnAlias.toLowerCase(Locale.ROOT);
                     aliasMap.putIfAbsent(columnAlias, counter);
 
                     String tableName = ci.getTable();
                     if (tableName != null && !tableName.isEmpty()) {
-                        aliasMap.putIfAbsent(tableName.toLowerCase() + "." + columnAlias, counter);
+                        aliasMap.putIfAbsent(tableName.toLowerCase(Locale.ROOT) + "." + columnAlias, counter);
                     }
                 }
                 counter++;
@@ -110,12 +111,12 @@ public int getIndex(String name) throws SQLException {
             for (ColumnInformation ci : columnInfo) {
                 String columnRealName = ci.getOriginalName();
                 if (columnRealName != null && !columnRealName.isEmpty()) {
-                    columnRealName = columnRealName.toLowerCase();
+                    columnRealName = columnRealName.toLowerCase(Locale.ROOT);
                     originalMap.putIfAbsent(columnRealName, counter);
 
                     String tableName = ci.getOriginalTable();
                     if (tableName != null && !tableName.isEmpty()) {
-                        originalMap.putIfAbsent(tableName.toLowerCase() + "." + columnRealName, counter);
+                        originalMap.putIfAbsent(tableName.toLowerCase(Locale.ROOT) + "." + columnRealName, counter);
                     }
                 }
                 counter++;

diff --git a/src/main/java/org/mariadb/jdbc/internal/failover/AbstractMastersListener.java b/src/main/java/org/mariadb/jdbc/internal/failover/AbstractMastersListener.java
@@ -66,6 +66,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.sql.SQLException;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -300,7 +301,7 @@ public HandleErrorResult relaunchOperation(Method method, Object[] args) throws
 
                 case "executeQuery":
                     if (args[2] instanceof String) {
-                        String query = ((String) args[2]).toUpperCase();
+                        String query = ((String) args[2]).toUpperCase(Locale.ROOT);
                         if (!"ALTER SYSTEM CRASH".equals(query)
                                 && !query.startsWith("KILL")) {
                             logger.debug("relaunch query to new connection {}",
@@ -349,17 +350,18 @@ public boolean isQueryRelaunchable(Method method, Object[] args) {
                 case "executeQuery":
                     if (!((Boolean) args[0])) return true; //launched on slave connection
                     if (args[2] instanceof String) {
-                        return ((String) args[2]).toUpperCase().startsWith("SELECT");
+                        return ((String) args[2]).toUpperCase(Locale.ROOT).startsWith("SELECT");
                     } else if (args[2] instanceof ClientPrepareResult) {
                         @SuppressWarnings("unchecked")
-                        String query = new String(((ClientPrepareResult) args[2]).getQueryParts().get(0)).toUpperCase();
+                        String query = new String(((ClientPrepareResult) args[2]).getQueryParts().get(0))
+                                .toUpperCase(Locale.ROOT);
                         return query.startsWith("SELECT");
                     }
                     break;
                 case "executePreparedQuery":
                     if (!((Boolean) args[0])) return true; //launched on slave connection
                     ServerPrepareResult serverPrepareResult = (ServerPrepareResult) args[1];
-                    return (serverPrepareResult.getSql()).toUpperCase().startsWith("SELECT");
+                    return (serverPrepareResult.getSql()).toUpperCase(Locale.ROOT).startsWith("SELECT");
                 case "executeBatchStmt":
                 case "executeBatchClient":
                 case "executeBatchServer":

diff --git a/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractQueryProtocol.java b/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractQueryProtocol.java
@@ -94,6 +94,7 @@
 import java.nio.charset.StandardCharsets;
 import java.sql.*;
 import java.util.List;
+import java.util.Locale;
 import java.util.ServiceLoader;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
@@ -393,7 +394,7 @@ private boolean executeBulkBatch(Results results, String sql, ServerPrepareResul
         }
 
         //any select query is not applicable to bulk
-        if (sql.toLowerCase().contains("select")) return false;
+        if (sql.toLowerCase(Locale.ROOT).contains("select")) return false;
 
         cmdPrologue();
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/protocol/tls/HostnameVerifierImpl.java b/src/main/java/org/mariadb/jdbc/internal/protocol/tls/HostnameVerifierImpl.java
@@ -38,8 +38,8 @@ public class HostnameVerifierImpl implements HostnameVerifier {
      */
     private static boolean matchDns(String hostname, String tlsDnsPattern) throws SSLException {
         boolean hostIsIp = Utils.isIPv4(hostname) || Utils.isIPv6(hostname);
-        StringTokenizer hostnameSt = new StringTokenizer(hostname.toLowerCase(), ".");
-        StringTokenizer templateSt = new StringTokenizer(tlsDnsPattern.toLowerCase(), ".");
+        StringTokenizer hostnameSt = new StringTokenizer(hostname.toLowerCase(Locale.ROOT), ".");
+        StringTokenizer templateSt = new StringTokenizer(tlsDnsPattern.toLowerCase(Locale.ROOT), ".");
         if (hostnameSt.countTokens() != templateSt.countTokens()) return false;
 
         try {

diff --git a/src/main/java/org/mariadb/jdbc/internal/util/Utils.java b/src/main/java/org/mariadb/jdbc/internal/util/Utils.java
@@ -77,6 +77,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.Locale;
 import java.util.TimeZone;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.regex.Pattern;
@@ -224,7 +225,7 @@ private static String replaceFunctionParameter(String functionString) {
         for (; ((input[index] >= 'a' && index <= 'z') || (input[index] >= 'A' && input[index] <= 'Z')) && index < input.length; index++) {
             sb.append(input[index]);
         }
-        String func = sb.toString().toLowerCase();
+        String func = sb.toString().toLowerCase(Locale.ROOT);
 
         if ("convert".equals(func) || "timestampdiff".equals(func) || "timestampadd".equals(func)) {
             String paramPrefix;
@@ -277,7 +278,7 @@ private static String resolveEscapes(String escaped, boolean noBackslashEscapes)
             throw new SQLException("unexpected escaped string");
         }
         int endIndex = escaped.length() - 1;
-        String escapedLower = escaped.toLowerCase();
+        String escapedLower = escaped.toLowerCase(Locale.ROOT);
         if (escaped.startsWith("{fn ")) {
             String resolvedParams = replaceFunctionParameter(escaped.substring(4, endIndex));
             return nativeSql(resolvedParams, noBackslashEscapes);

diff --git a/src/test/java/org/mariadb/jdbc/CollationTest.java b/src/test/java/org/mariadb/jdbc/CollationTest.java
@@ -59,6 +59,7 @@
 import java.io.StringReader;
 import java.nio.charset.Charset;
 import java.sql.*;
+import java.util.Locale;
 
 import static org.junit.Assert.*;
 
@@ -232,5 +233,32 @@ public void insertAndSelectShouldBothUseLatin1Encoding() throws SQLException {
         assertFalse(rs1.next());
     }
 
+    @Test
+    public void languageCasing() throws SQLException {
+        Locale currentLocal = Locale.getDefault();
+        createTable("languageCasing", "ID int, id2 int");
+        try (Statement statement = sharedConnection.createStatement()) {
+            statement.execute("INSERT INTO languageCasing values (1,2)");
+
+            ResultSet rs = statement.executeQuery("SELECT * FROM languageCasing");
+            assertTrue(rs.next());
+            assertEquals(1, rs.getInt("ID"));
+            assertEquals(1, rs.getInt("id"));
+            assertEquals(2, rs.getInt("ID2"));
+            assertEquals(2, rs.getInt("id2"));
+
+            Locale.setDefault(new Locale("tr"));
+
+            rs = statement.executeQuery("SELECT * FROM languageCasing");
+            assertTrue(rs.next());
+            assertEquals(1, rs.getInt("ID"));
+            assertEquals(1, rs.getInt("id"));
+            assertEquals(2, rs.getInt("ID2"));
+            assertEquals(2, rs.getInt("id2"));
+
+        } finally {
+            Locale.setDefault(currentLocal);
+        }
+    }
 
 }