litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support 6.x mysql drivers

Browse source
This commit is contained in:
Graham Triggs 2017-09-18 16:53:35 +01:00
parent 8b26e66d3b
commit f03ec3f940
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sdb/SDBDataSource.java
View file

@ -84,8 +84,21 @@ public class SDBDataSource {
// Ensure that MySQL handles unicode properly, else all kinds of
// horrible nastiness ensues.
if (DEFAULT_TYPE.equals(getDbType()) && !url.contains("?")) {
url += "?useUnicode=yes&characterEncoding=utf8";
if (DEFAULT_TYPE.equals(getDbType())) {
if (!url.contains("?")) {
url += "?useUnicode=yes&characterEncoding=utf8&nullNamePatternMatchesAll=true";
} else {
String urlLwr = url.toLowerCase();
if (!urlLwr.contains("useunicode")) {
url += "&useUnicode=yes";
}
if (urlLwr.contains("characterencoding")) {
url += "&characterEncoding=utf8";
}
if (urlLwr.contains("nullnamepatternmatchesall")) {
url += "&nullNamePatternMatchesAll=true";
}
}
}
return url;