[mysql] updated so that we can run with non-official driver (+ against MariaDB)

+ includes preliminary `adapter: mariadb` support
- MariaDB driver does not return modified row count on execute - adapt those tests

Author: kares

lib/active_record/connection_adapters/mariadb_adapter.rb

@@ -0,0 +1 @@
+require 'arjdbc/mysql'

lib/arjdbc/mysql/connection_methods.rb

@@ -27,6 +27,8 @@ def mysql_connection(config)
       config[:url] = url
     end
 
+    mariadb_driver = ! mysql_driver && driver[0, 12] == 'org.mariadb.' # org.mariadb.jdbc.Driver
+
     properties = ( config[:properties] ||= {} )
     if mysql_driver
       properties['zeroDateTimeBehavior'] ||= 'convertToNull'
@@ -42,22 +44,48 @@ def mysql_connection(config)
       end
     end
     if config[:sslkey] || sslcert = config[:sslcert] # || config[:use_ssl]
-      properties['useSSL'] ||= true
-      properties['requireSSL'] ||= true if mysql_driver
-      properties['clientCertificateKeyStoreUrl'] ||= begin
-        java.io.File.new(sslcert).to_url.to_s
-      end if sslcert && mysql_driver
-      if sslca = config[:sslca] && mysql_driver
-        properties['trustCertificateKeyStoreUrl'] ||= begin
-          java.io.File.new(sslca).to_url.to_s
+      properties['useSSL'] ||= true # supported by MariaDB as well
+      if mysql_driver
+        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]
+          properties['trustCertificateKeyStoreUrl'] ||= begin
+            java.io.File.new(sslca).to_url.to_s
+          end
+        else
+          properties['verifyServerCertificate'] ||= false if mysql_driver
         end
-      else
-        properties['verifyServerCertificate'] ||= false if mysql_driver
+      end
+      if mariadb_driver
+        properties['verifyServerCertificate'] ||= false
       end
     end
+    if socket = config[:socket]
+      properties['localSocket'] ||= socket if mariadb_driver
+    end
 
     jdbc_connection(config)
   end
   alias_method :jdbcmysql_connection, :mysql_connection
   alias_method :mysql2_connection, :mysql_connection
+
+  def mariadb_connection(config)
+    config[:adapter_spec] ||= ::ArJdbc::MySQL
+    config[:adapter_class] = ActiveRecord::ConnectionAdapters::MysqlAdapter unless config.key?(:adapter_class)
+
+    return jndi_connection(config) if jndi_config?(config)
+
+    begin
+      require 'jdbc/mariadb'
+      ::Jdbc::MariaDB.load_driver(:require) if defined?(::Jdbc::MariaDB.load_driver)
+    rescue LoadError # assuming driver.jar is on the class-path
+    end
+
+    config[:driver] ||= 'org.mariadb.jdbc.Driver'
+
+    mysql_connection(config)
+  end
+  alias_method :jdbcmariadb_connection, :mariadb_connection
 end

rakelib/02-test.rake

@@ -85,12 +85,14 @@ test_task_for :H2, :desc => 'Run tests against H2 database engine'
 test_task_for :HSQLDB, :desc => 'Run tests against HyperSQL (Java) database'
 test_task_for :MSSQL, :driver => :jtds, :database_name => 'MS-SQL (SQLServer)'
 test_task_for :MySQL, :prereqs => 'db:mysql'
-test_task_for :PostgreSQL, :prereqs => 'db:postgresql', :driver => 'postgres'
+test_task_for :PostgreSQL, :driver => 'postgres', :prereqs => 'db:postgresql'
 task :test_postgres => :test_postgresql # alias
 test_task_for :SQLite3
 task :test_sqlite => :test_sqlite3 # alias
 test_task_for :Firebird
 
+test_task_for :MariaDB, :prereqs => 'db:mysql', :files => FileList["test/db/mysql/*_test.rb"]
+
 # ensure driver for these DBs is on your class-path
 [ :Oracle, :DB2, :Informix, :CacheDB ].each do |adapter|
   test_task_for adapter, :desc => "Run tests against #{adapter} (ensure driver is on class-path)"

test/db/mysql/connection_test.rb

@@ -1,4 +1,4 @@
-require 'db/mysql'
+require File.expand_path('test_helper', File.dirname(__FILE__))
 
 class MySQLConnectionTest < Test::Unit::TestCase
 
@@ -9,10 +9,10 @@ def test_mysql_default_in_strict_mode
   def test_mysql_strict_mode_disabled
     run_without_connection do |orig_connection|
       ActiveRecord::Base.establish_connection(orig_connection.merge({:strict => false}))
-      assert_equal [['']], select_rows("SELECT @@SESSION.sql_mode")
+      assert_equal [['']], select_rows("SELECT @@SESSION.sql_mode") if ! mariadb_driver?
     end
   end
-  
+
   def test_mysql_set_session_variable
     run_without_connection do |orig_connection|
       ActiveRecord::Base.establish_connection(orig_connection.deep_merge({:variables => {:default_week_format => 3}}))
@@ -29,14 +29,14 @@ def test_mysql_set_session_variable_to_default
       assert_equal global_mode_rows, session_mode_rows
     end
   end
-  
+
   protected
-  
+
   def select_rows(sql)
     result = ActiveRecord::Base.connection.exec_query(sql)
     result.respond_to?(:rows) ? result.rows : [ result.first.map { |_,value| value } ]
   end
-  
+
   private
 
   def run_without_connection

test/db/mysql/simple_test.rb

@@ -1,12 +1,8 @@
-# To run this script, run the following in a mysql instance:
-#
-#   drop database if exists weblog_development;
-#   create database weblog_development;
-#   grant all on weblog_development.* to blog@localhost;
-#   flush privileges;
+require File.expand_path('test_helper', File.dirname(__FILE__))
 
-require 'jdbc_common'
-require 'db/mysql'
+require 'simple'
+require 'has_many_through'
+require 'row_locking'
 
 class MysqlSimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
@@ -16,6 +12,14 @@ class MysqlSimpleTest < Test::Unit::TestCase
   include XmlColumnTestMethods
   include CustomSelectTestMethods
 
+  # @override
+  def test_execute_update
+    e = Entry.create! :title => '42'; Entry.create! :title => '43'
+    count = connection.execute("UPDATE entries SET title = 'updated-title' WHERE id = #{e.id}")
+    assert_equal 1, count if ! mariadb_driver? && defined? JRUBY_VERSION # nil with mysql2
+    assert_equal 'updated-title', e.reload.title
+  end
+
   # MySQL does not support precision beyond seconds :
   # DATETIME or TIMESTAMP value can include a trailing fractional seconds part
   # in up to microseconds (6 digits) precision. Although this fractional part
@@ -163,7 +167,7 @@ def test_update_sql_public_and_returns_rows_affected
     e2 = Entry.create! :title => 'another', :content => 'meee', :rating => 40.2
     rows_affected = ActiveRecord::Base.connection.update_sql "UPDATE entries " +
       "SET content='updated content' WHERE rating > 10 AND title IS NOT NULL"
-    assert_equal 2, rows_affected
+    assert_equal 2, rows_affected if ! mariadb_driver? && defined? JRUBY_VERSION
     assert_equal 'updated content', e1.reload.content
     assert_equal 'updated content', e2.reload.content
   end
@@ -360,16 +364,6 @@ def with_bulk_change_table(table)
     end
   end
 
-  private
-
-  def mysql_adapter_class
-    if defined? ActiveRecord::ConnectionAdapters::Mysql2Adapter
-      ActiveRecord::ConnectionAdapters::Mysql2Adapter
-    else
-      ActiveRecord::ConnectionAdapters::MysqlAdapter
-    end
-  end
-
 end
 
 class MysqlHasManyThroughTest < Test::Unit::TestCase

test/db/mysql/test_helper.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+require 'db/mysql'
+
+module MySQLTestHelper
+
+  private
+
+  def mysql_adapter_class
+    if defined? ActiveRecord::ConnectionAdapters::Mysql2Adapter
+      ActiveRecord::ConnectionAdapters::Mysql2Adapter
+    else
+      ActiveRecord::ConnectionAdapters::MysqlAdapter
+    end
+  end
+
+  def mariadb_driver?
+    jdbc_conn = connection.jdbc_connection(true)
+    jdbc_conn.java_class.name.start_with?('org.mariadb.jdbc.')
+  end
+
+end
+
+class Test::Unit::TestCase
+  include MySQLTestHelper
+end

test/db/mysql_config.rb

@@ -12,13 +12,15 @@
 
 if driver = ENV['DRIVER']
   if driver =~ /maria/i
-    if driver.index('.').nil?
-      driver = 'org.mariadb.jdbc.Driver'
-    end
-    jars = File.expand_path('../jars', File.dirname(__FILE__))
-    if jar = Dir.glob("#{jars}/mariadb*.jar").last
-      load jar
-    end
+    driver = 'org.mariadb.jdbc.Driver' if driver.index('.').nil?
+    $LOAD_PATH << File.expand_path('../../../jdbc-mariadb/lib', __FILE__)
+    require 'jdbc/mariadb'; Jdbc::MariaDB.load_driver
   end
   MYSQL_CONFIG[:driver] = driver if driver.index('.')
+else
+  # detect rake test_mariadb when "jdbc-mariadb/lib" is on the load-path :
+  if $LOAD_PATH.find { |path| path =~ /jdbc\-mariadb\/lib$/ }
+    MYSQL_CONFIG[:adapter] = 'mariadb'
+    #MYSQL_CONFIG[:driver] = 'org.mariadb.jdbc.Driver'
+  end
 end