From 1f71e6aa4c79b215aebed800cc06d9e857a74a58 Mon Sep 17 00:00:00 2001
From: Pat Allan <pat@freelancing-gods.com>
Date: Mon, 19 Jun 2017 20:20:52 +1000
Subject: [PATCH] Update test suite for latest JRuby/JDBC approach.

---
 spec/support/sphinx.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/spec/support/sphinx.rb b/spec/support/sphinx.rb
index 6d5e860..4ef981f 100644
--- a/spec/support/sphinx.rb
+++ b/spec/support/sphinx.rb
@@ -4,6 +4,7 @@
 if RUBY_PLATFORM == 'java'
   require 'java'
   require 'jdbc/mysql'
+  Jdbc::MySQL.load_driver
 end
 
 if ENV["TRAVIS"] == "true"
@@ -57,8 +58,12 @@ def setup_mysql
   end
 
   def setup_mysql_on_jruby
-    address = "jdbc:mysql://#{host}"
-    client = java.sql.DriverManager.getConnection(address, username, password)
+    address    = "jdbc:mysql://#{host}"
+    properties = Java::JavaUtil::Properties.new
+    properties.setProperty "user", username     if username
+    properties.setProperty "password", password if password
+
+    client = Java::ComMysqlJdbc::Driver.new.connect address, properties
 
     set       = client.createStatement.executeQuery('SHOW DATABASES')
     databases = []