From f03ec3f940a3d516dd7461e847b59480bde4e9e2 Mon Sep 17 00:00:00 2001
From: Graham Triggs <gtriggs@duraspace.org>
Date: Mon, 18 Sep 2017 16:53:35 +0100
Subject: [PATCH] Support 6.x mysql drivers

---
 .../triplesource/impl/sdb/SDBDataSource.java    | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sdb/SDBDataSource.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sdb/SDBDataSource.java
index 8e26d7818..896ba7a33 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sdb/SDBDataSource.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sdb/SDBDataSource.java
@@ -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;