[test] handle 8.0 driver changes in JNDI tests

Author: kares

test/db/jndi_mysql_config.rb

@@ -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