Merge pull request #1026 from jruby/jdbc-mysql-8

[jdbc-mysql] upgrade to new major version 8.0

Author: kares

jdbc-mysql/lib/jdbc/mysql.rb

@@ -5,15 +5,15 @@ module Jdbc
   module MySQL
 
     def self.driver_jar
-      "mysql-connector-java-#{DRIVER_VERSION}-bin.jar"
+      "mysql-connector-java-#{DRIVER_VERSION}.jar"
     end
 
     def self.load_driver(method = :load)
       send method, driver_jar
     end
 
     def self.driver_name
-      'com.mysql.jdbc.Driver'
+      'com.mysql.cj.jdbc.Driver'
     end
 
     if defined?(JRUBY_VERSION) && # enable backwards-compat behavior :

jdbc-mysql/lib/jdbc/mysql/version.rb

@@ -1,6 +1,6 @@
 module Jdbc
   module MySQL
-    DRIVER_VERSION = '5.1.47'
+    DRIVER_VERSION = '8.0.17'
     VERSION = DRIVER_VERSION
   end
 end

jdbc-mysql/lib/mysql-connector-java-5.1.47-bin.jar

@@ -68,6 +68,7 @@ def mysql_connection(config)
         # with reconnect fail-over sets connection read-only (by default)
         # properties['failOverReadOnly'] ||= 'false'
       end
+      properties['noDatetimeStringSync'] = true unless properties.key?('noDatetimeStringSync')
     end
     if config[:sslkey] || sslcert = config[:sslcert] # || config[:use_ssl]
       properties['useSSL'] ||= true # supported by MariaDB as well
@@ -90,11 +91,12 @@ def mysql_connection(config)
       properties['localSocket'] ||= socket if mariadb_driver
     end
 
+    # properties['useJDBCCompliantTimezoneShift'] ||= true
     # for the Connector/J 5.1 line this is true by default - but it requires some really nasty
     # quirks to get casted Time values extracted properly according for AR's default_timezone
     # - thus we're turning it off (should be off in newer driver versions >= 6 anyway)
     # + also MariaDB driver is compilant and we would need to branch out based on driver
-    properties['useLegacyDatetimeCode'] = false
+    properties['useLegacyDatetimeCode'] = false # disables the effect of 'useTimezone'
 
     jdbc_connection(config)
   end

jdbc-mysql/lib/mysql-connector-java-8.0.17.jar

@@ -1,6 +1,6 @@
 require 'db/jndi_base'
 
-JNDI_MYSQL_CONFIG = { :adapter => 'mysql', :jndi => 'jdbc/MyDB' }
+JNDI_MYSQL_CONFIG = { :adapter => 'mysql2', :jndi => 'jdbc/MyDB' }
 
 unless ( ps = ENV['PREPARED_STATEMENTS'] || ENV['PS'] ).nil?
   JNDI_MYSQL_CONFIG[:prepared_statements] = ps
@@ -11,7 +11,15 @@
 
 require 'db/mysql_config'
 
-data_source = com.mysql.jdbc.jdbc2.optional.MysqlDataSource.new
+old_driver = nil
+begin
+  data_source = com.mysql.cj.jdbc.MysqlDataSource
+rescue NameError
+  data_source = com.mysql.jdbc.jdbc2.optional.MysqlDataSource
+  old_driver = true
+end
+
+data_source = data_source.new
 data_source.database_name = MYSQL_CONFIG[:database]
 data_source.url = MYSQL_CONFIG[:url] if MYSQL_CONFIG[:url]
 data_source.server_name = MYSQL_CONFIG[:host] if MYSQL_CONFIG[:host]
@@ -20,10 +28,10 @@
 data_source.password = MYSQL_CONFIG[:password] if MYSQL_CONFIG[:password]
 
 # must set these to match non-jndi setup
-data_source.cache_default_timezone = false
+data_source.cache_default_timezone = false if data_source.respond_to?(:cache_default_timezone)
 data_source.server_timezone = java.util.TimeZone.getDefault.getID
-data_source.use_legacy_datetime_code = false
-data_source.zero_date_time_behavior = 'convertToNull'
+data_source.use_legacy_datetime_code = false if data_source.respond_to?(:use_legacy_datetime_code)
+data_source.zero_date_time_behavior = old_driver ? 'convertToNull' : 'CONVERT_TO_NULL'
 data_source.jdbc_compliant_truncation = false
 
 javax.naming.InitialContext.new.bind JNDI_MYSQL_CONFIG[:jndi], data_source

lib/arjdbc/mysql/connection_methods.rb

@@ -148,21 +148,16 @@ def initialize; end
       assert_equal false, config[:properties]['useSSL']
     end
 
-    def load_jdbc_mysql
-      require 'jdbc/mysql'
-    rescue LoadError
-      return nil
-    end
-
   end
 
   context 'connection (Jdbc::MySQL missing)' do
 
     module ::Jdbc; end
 
-    @@jdbc_mysql = ::Jdbc::MySQL rescue nil
-
+    @@jdbc_mysql = false
     def setup
+      load_jdbc_mysql
+      @@jdbc_mysql = ::Jdbc::MySQL rescue nil
       ::Jdbc.send :remove_const, :MySQL if @@jdbc_mysql
     end
 
@@ -224,4 +219,10 @@ def teardown
 
   end
 
+  def load_jdbc_mysql
+    require 'jdbc/mysql'
+  rescue LoadError
+    return nil
+  end
+
 end if defined? JRUBY_VERSION