[mysql] initial hacks to allow running with non-official JDBC driver

Author: kares

lib/arjdbc/mysql/adapter.rb

@@ -19,7 +19,9 @@ def self.jdbc_connection_class
     # @private
     def init_connection(jdbc_connection)
       meta = jdbc_connection.meta_data
-      if meta.driver_major_version < 5
+      if meta.driver_major_version == 1 # TODO check in driver code
+        # assumes MariaDB 1.x currently
+      elsif meta.driver_major_version < 5
         raise ::ActiveRecord::ConnectionNotEstablished,
           "MySQL adapter requires driver >= 5.0 got: '#{meta.driver_version}'"
       elsif meta.driver_major_version == 5 && meta.driver_minor_version < 1

lib/arjdbc/mysql/connection_methods.rb

@@ -5,11 +5,14 @@ def mysql_connection(config)
 
     return jndi_connection(config) if jndi_config?(config)
 
+    driver = config[:driver] ||=
+      defined?(::Jdbc::MySQL.driver_name) ? ::Jdbc::MySQL.driver_name : 'com.mysql.jdbc.Driver'
+
     begin
       require 'jdbc/mysql'
       ::Jdbc::MySQL.load_driver(:require) if defined?(::Jdbc::MySQL.load_driver)
     rescue LoadError # assuming driver.jar is on the class-path
-    end
+    end if mysql_driver = driver[0, 10] == 'com.mysql.'
 
     config[:username] = 'root' unless config.key?(:username)
     # jdbc:mysql://[host][,failoverhost...][:port]/[database]
@@ -23,32 +26,33 @@ def mysql_connection(config)
       url << "/#{config[:database]}"
       config[:url] = url
     end
-    config[:driver] ||= defined?(::Jdbc::MySQL.driver_name) ? ::Jdbc::MySQL.driver_name : 'com.mysql.jdbc.Driver'
 
     properties = ( config[:properties] ||= {} )
-    properties['zeroDateTimeBehavior'] ||= 'convertToNull'
-    properties['jdbcCompliantTruncation'] ||= 'false'
-    properties['useUnicode'] = 'true' unless properties.key?('useUnicode') # otherwise platform default
-    encoding = config.key?(:encoding) ? config[:encoding] : 'utf8'
-    properties['characterEncoding'] = encoding if encoding
-    if ! ( reconnect = config[:reconnect] ).nil?
-      properties['autoReconnect'] ||= reconnect.to_s
-      # properties['maxReconnects'] ||= '3'
-      # with reconnect fail-over sets connection read-only (by default)
-      # properties['failOverReadOnly'] ||= 'false'
+    if mysql_driver
+      properties['zeroDateTimeBehavior'] ||= 'convertToNull'
+      properties['jdbcCompliantTruncation'] ||= 'false'
+      properties['useUnicode'] = 'true' unless properties.key?('useUnicode') # otherwise platform default
+      encoding = config.key?(:encoding) ? config[:encoding] : 'utf8'
+      properties['characterEncoding'] = encoding if encoding
+      if ! ( reconnect = config[:reconnect] ).nil?
+        properties['autoReconnect'] ||= reconnect.to_s
+        # properties['maxReconnects'] ||= '3'
+        # with reconnect fail-over sets connection read-only (by default)
+        # properties['failOverReadOnly'] ||= 'false'
+      end
     end
     if config[:sslkey] || sslcert = config[:sslcert] # || config[:use_ssl]
       properties['useSSL'] ||= true
-      properties['requireSSL'] ||= true
+      properties['requireSSL'] ||= true if mysql_driver
       properties['clientCertificateKeyStoreUrl'] ||= begin
         java.io.File.new(sslcert).to_url.to_s
-      end if sslcert
-      if sslca = config[:sslca]
+      end if sslcert && mysql_driver
+      if sslca = config[:sslca] && mysql_driver
         properties['trustCertificateKeyStoreUrl'] ||= begin
           java.io.File.new(sslca).to_url.to_s
         end
       else
-        properties['verifyServerCertificate'] ||= false
+        properties['verifyServerCertificate'] ||= false if mysql_driver
       end
     end