Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Remove MySQL connection charset property defaults #1295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xael-fry merged 2 commits into from
Mar 12, 2019
Merged

Remove MySQL connection charset property defaults #1295

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a67b35e
Remove MySQL connection charset property defaults
tazmaniax Feb 10, 2019
211da06
Trigger build
tazmaniax Mar 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 1 addition & 28 deletions framework/src/play/db/DBPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,9 @@ private boolean changed() {
String name = m.group("name");
String host = m.group("host");
String parameters = m.group("parameters");

Map<String, String> 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);
}
Expand Down Expand Up @@ -251,28 +245,7 @@ private boolean changed() {
}
return false;
}

private static void addParameters(Map<String, String> 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<String, String> paramMap) {
StringBuilder builder = new StringBuilder();
for (Map.Entry<String, String> 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
*/
Expand Down