diff --git a/framework/src/play/db/DBPlugin.java b/framework/src/play/db/DBPlugin.java index 1a5c415409..ba4b24b9a3 100644 --- a/framework/src/play/db/DBPlugin.java +++ b/framework/src/play/db/DBPlugin.java @@ -184,15 +184,9 @@ private boolean changed() { String name = m.group("name"); String host = m.group("host"); String parameters = m.group("parameters"); - - Map paramMap = new HashMap<>(); - paramMap.put("useUnicode", "yes"); - paramMap.put("characterEncoding", "UTF-8"); - paramMap.put("connectionCollation", "utf8_general_ci"); - addParameters(paramMap, parameters); dbConfig.put("db.driver", "com.mysql.jdbc.Driver"); - dbConfig.put("db.url", "jdbc:mysql://" + (host == null ? "localhost" : host) + "/" + name + "?" + toQueryString(paramMap)); + dbConfig.put("db.url", "jdbc:mysql://" + (host == null ? "localhost" : host) + "/" + name + "?" + parameters); if (user != null) { dbConfig.put("db.user", user); } @@ -251,28 +245,7 @@ private boolean changed() { } return false; } - - private static void addParameters(Map paramsMap, String urlQuery) { - if (!StringUtils.isBlank(urlQuery)) { - String[] params = urlQuery.split("[\\&]"); - for (String param : params) { - String[] parts = param.split("[=]"); - if (parts.length > 0 && !StringUtils.isBlank(parts[0])) { - paramsMap.put(parts[0], parts.length > 1 ? StringUtils.stripToNull(parts[1]) : null); - } - } - } - } - private static String toQueryString(Map paramMap) { - StringBuilder builder = new StringBuilder(); - for (Map.Entry entry : paramMap.entrySet()) { - if (builder.length() > 0) builder.append("&"); - builder.append(entry.getKey()).append("=").append(entry.getValue() != null ? entry.getValue() : ""); - } - return builder.toString(); - } - /** * Needed because DriverManager will not load a driver ouside of the system classloader */