From b967a184b082f80dbe691ee4d48f5052ca3c17c1 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 30 Jan 2017 16:45:58 -0500
Subject: [PATCH] Update to MySQL driver 6.0.5

---
 pom.xml                                      | 2 +-
 src/main/java/com/iciql/util/JdbcUtils.java  | 2 +-
 src/test/java/com/iciql/test/IciqlSuite.java | 2 +-
 src/test/java/com/iciql/test/ViewsTest.java  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 25ba6ce..fa91da8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.38</version>
+            <version>6.0.5</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
diff --git a/src/main/java/com/iciql/util/JdbcUtils.java b/src/main/java/com/iciql/util/JdbcUtils.java
index 1a20489..79c71f2 100644
--- a/src/main/java/com/iciql/util/JdbcUtils.java
+++ b/src/main/java/com/iciql/util/JdbcUtils.java
@@ -40,7 +40,7 @@ public class JdbcUtils {
             "FrontBase:", "com.frontbase.jdbc.FBJDriver", "firebirdsql:", "org.firebirdsql.jdbc.FBDriver",
             "hsqldb:", "org.hsqldb.jdbcDriver", "informix-sqli:", "com.informix.jdbc.IfxDriver", "jtds:",
             "net.sourceforge.jtds.jdbc.Driver", "microsoft:", "com.microsoft.jdbc.sqlserver.SQLServerDriver",
-            "mimer:", "com.mimer.jdbc.Driver", "mysql:", "com.mysql.jdbc.Driver", "odbc:",
+            "mimer:", "com.mimer.jdbc.Driver", "mysql:", "com.mysql.cj.jdbc.Driver", "odbc:",
             "sun.jdbc.odbc.JdbcOdbcDriver", "oracle:", "oracle.jdbc.driver.OracleDriver", "pervasive:",
             "com.pervasive.jdbc.v2.Driver", "pointbase:micro:", "com.pointbase.me.jdbc.jdbcDriver",
             "pointbase:", "com.pointbase.jdbc.jdbcUniversalDriver", "postgresql:", "org.postgresql.Driver",
diff --git a/src/test/java/com/iciql/test/IciqlSuite.java b/src/test/java/com/iciql/test/IciqlSuite.java
index a5470d9..92525e0 100644
--- a/src/test/java/com/iciql/test/IciqlSuite.java
+++ b/src/test/java/com/iciql/test/IciqlSuite.java
@@ -110,7 +110,7 @@ public class IciqlSuite {
             new TestDb("Derby", "memory", "jdbc:derby:memory:iciql;create=true"),
             new TestDb("Derby", "file", "jdbc:derby:directory:testdbs/derby/iciql;create=true"),
             new TestDb("Derby", "tcp", "jdbc:derby://localhost:1527/testdbs/derby/iciql;create=true", "sa", "sa"),
-            new TestDb("MySQL", "tcp", "jdbc:mysql://localhost:3306/iciql", "sa", "sa"),
+            new TestDb("MySQL", "tcp", "jdbc:mysql://localhost:3306/iciql?useSSL=false", "sa", "sa"),
             new TestDb("PostgreSQL", "tcp", "jdbc:postgresql://localhost:5432/iciql", "sa", "sa"),
 
             //
diff --git a/src/test/java/com/iciql/test/ViewsTest.java b/src/test/java/com/iciql/test/ViewsTest.java
index cf4df7d..eba1a01 100644
--- a/src/test/java/com/iciql/test/ViewsTest.java
+++ b/src/test/java/com/iciql/test/ViewsTest.java
@@ -22,7 +22,7 @@ import com.iciql.test.models.ProductView;
 import com.iciql.test.models.ProductViewFromQuery;
 import com.iciql.test.models.ProductViewInherited;
 import com.iciql.test.models.ProductViewInheritedComplex;
-import com.mysql.jdbc.StringUtils;
+import com.iciql.util.StringUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-- 
2.39.5