Merge branch '50-stable' into 51-stable

* 50-stable:
  [test] db_version helper working on 5.X as well

Author: kares

test/db/mysql/change_column_test.rb

@@ -13,7 +13,7 @@ class MySQLChangeColumnTest < Test::Unit::TestCase
       ActiveRecord::Migration.add_column :people, :about, :string, :default => 'x'
       # NOTE: even in non strict mode MySQL does not allow us add or change
       # text/binary with a default ...
-      if mariadb_server? && ActiveRecord::Base.connection.database_version >= '10.2'
+      if mariadb_server? && db_version >= '10.2'
         ActiveRecord::Migration.change_column :people, :about, :text
       else
         assert_raises ActiveRecord::StatementInvalid do

test/db/mysql/test_helper.rb

@@ -22,6 +22,11 @@ def mariadb_driver?; end unless defined? JRUBY_VERSION
   def mariadb_server?; connection.send(:mariadb?) end
   alias mariadb? mariadb_server?
 
+  def database_version
+    ActiveRecord::Base.connection.raw_connection.full_version
+  end
+  alias db_version database_version
+
 end
 
 class Test::Unit::TestCase