activerecord-jdbc-alt-adapter 50.7.0-java → 51.3.0-java

data/lib/arjdbc/mssql/adapter.rb

@@ -7,6 +7,9 @@ require 'arel/visitors/bind_visitor'
 require 'arel/visitors/sqlserver'
 require 'active_record/connection_adapters/abstract_adapter'
 
+require 'arjdbc/mssql/extensions/attribute_methods'
+require 'arjdbc/mssql/extensions/calculations'
+
 require 'arjdbc/abstract/core'
 require 'arjdbc/abstract/connection_management'
 require 'arjdbc/abstract/database_statements'
@@ -18,9 +21,9 @@ require 'arjdbc/mssql/types'
 require 'arjdbc/mssql/quoting'
 require 'arjdbc/mssql/schema_definitions'
 require 'arjdbc/mssql/schema_statements'
+require 'arjdbc/mssql/schema_dumper'
 require 'arjdbc/mssql/database_statements'
 require 'arjdbc/mssql/explain_support'
-require 'arjdbc/mssql/extensions'
 require 'arjdbc/mssql/transaction'
 require 'arjdbc/mssql/errors'
 require 'arjdbc/mssql/schema_creation'
@@ -51,6 +54,7 @@ module ActiveRecord
 
       include MSSQL::Quoting
       include MSSQL::SchemaStatements
+      include MSSQL::ColumnDumper
       include MSSQL::DatabaseStatements
       include MSSQL::ExplainSupport
 
@@ -81,38 +85,11 @@ module ActiveRecord
         ::ActiveRecord::ConnectionAdapters::MSSQLColumn
       end
 
-      # Does this adapter support DDL rollbacks in transactions? That is, would
-      # CREATE TABLE or ALTER TABLE get rolled back by a transaction?
-      def supports_ddl_transactions?
-        true
-      end
-
-      # Can this adapter determine the primary key for tables not attached
-      # to an Active Record class, such as join tables?
-      def supports_primary_key?
-        true
-      end
-
       # Does this adapter support creating foreign key constraints?
       def supports_foreign_keys?
         true
       end
 
-      # Does this adapter support index sort order?
-      def supports_index_sort_order?
-        true
-      end
-
-      # Also known as filtered index
-      def supports_partial_index?
-        true
-      end
-
-      # Does this adapter support migrations?
-      def supports_migrations?
-        true
-      end
-
       # Does this adapter support setting the isolation level for a transaction?
       def supports_transaction_isolation?
         true
@@ -123,6 +100,11 @@ module ActiveRecord
         true
       end
 
+      # Does this adapter support views?
+      def supports_views?
+        true
+      end
+
       # Overrides abstract method which always returns false
       def valid_type?(type)
         !native_database_types[type].nil?
@@ -134,13 +116,6 @@ module ActiveRecord
         super
       end
 
-      def reset!
-        # execute 'IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION'
-        # NOTE: it seems the above line interferes with the jdbc driver
-        # and ending up in connection closed, issue seen in rails 5.2 and 6.0
-        reconnect!
-      end
-
       def disable_referential_integrity
         tables = tables_with_referential_integrity
 
@@ -211,22 +186,37 @@ module ActiveRecord
       alias_method :current_schema=, :default_schema=
 
       # Overrides method in abstract adapter
+      # FIXME: This needs to be fixed the we find a way how to
+      # get the collation per column basis. At the moment we only use
+      # the global database collation
       def case_sensitive_comparison(table, attribute, column, value)
         if value.nil?
           table[attribute].eq(value)
-        elsif value.acts_like?(:string)
+        elsif [:string, :text].include?(column.type) && collation && !collation.match(/_CS/)
           table[attribute].eq(Arel::Nodes::Bin.new(Arel::Nodes::BindParam.new))
+        # elsif value.acts_like?(:string)
+        #   table[attribute].eq(Arel::Nodes::Bin.new(Arel::Nodes::BindParam.new))
         else
           table[attribute].eq(Arel::Nodes::BindParam.new)
         end
       end
 
       def configure_connection
-        # Here goes initial settings per connection
+        execute("SET LOCK_TIMEOUT #{lock_timeout}")
 
         set_session_transaction_isolation
       end
 
+      def lock_timeout
+        timeout = config[:lock_timeout].to_i
+
+        if timeout.positive?
+          timeout
+        else
+          5_000
+        end
+      end
+
       def set_session_transaction_isolation
         isolation_level = config[:transaction_isolation]
 
@@ -263,9 +253,9 @@ module ActiveRecord
         end
       end
 
-      protected
+      private
 
-      def translate_exception(e, message)
+      def translate_exception(exception, message)
         case message
         when /(cannot insert duplicate key .* with unique index) | (violation of unique key constraint)/i
           RecordNotUnique.new(message)
@@ -275,6 +265,10 @@ module ActiveRecord
           ActiveRecord::InvalidForeignKey.new(message)
         when /(String or binary data would be truncated)/i
           ActiveRecord::ValueTooLong.new(message)
+        when /Cannot insert the value NULL into column .* does not allow nulls/
+          ActiveRecord::NotNullViolation.new(message)
+        when /Arithmetic overflow error converting expression/
+          ActiveRecord::RangeError.new(message)
         else
           super
         end

data/lib/arjdbc/mssql/connection_methods.rb

@@ -52,8 +52,6 @@ ArJdbc::ConnectionMethods.module_eval do
 
   # @note Assumes SQLServer SQL-JDBC driver on the class-path.
   def sqlserver_connection(config)
-    config = config.deep_dup
-
     config[:adapter_spec] ||= ::ArJdbc::MSSQL
     config[:adapter_class] = ActiveRecord::ConnectionAdapters::MSSQLAdapter unless config.key?(:adapter_class)
 
@@ -62,15 +60,12 @@ ArJdbc::ConnectionMethods.module_eval do
     config[:host] ||= 'localhost'
     config[:driver] ||= 'com.microsoft.sqlserver.jdbc.SQLServerDriver'
     config[:connection_alive_sql] ||= 'SELECT 1'
-    config[:lock_timeout] ||= 5000
 
     config[:url] ||= begin
       url = "jdbc:sqlserver://#{config[:host]}"
       url << ( config[:port] ? ":#{config[:port]};" : ';' )
       url << "databaseName=#{config[:database]};" if config[:database]
       url << "instanceName=#{config[:instance]};" if config[:instance]
-      url << "loginTimeout=#{config[:login_timeout].to_i};" if config[:login_timeout]
-      url << "lockTimeout=#{config[:lock_timeout].to_i};"
       app = config[:appname] || config[:application]
       url << "applicationName=#{app};" if app
       isc = config[:integrated_security] # Win only - needs sqljdbc_auth.dll

data/lib/arjdbc/mssql/database_statements.rb

@@ -87,7 +87,7 @@ module ActiveRecord
         end
 
         def identity_column_name(table_name)
-          for column in schema_cache.columns(table_name)
+          for column in columns(table_name)
             return column.name if column.identity?
           end
           nil

data/lib/arjdbc/mssql/explain_support.rb

@@ -41,7 +41,7 @@ module ActiveRecord
 
           binds.each do |bind|
             value = quote(bind.value_for_database)
-            sql.sub!('?', value)
+            sql = sql.sub('?', value)
           end
 
           sql

data/lib/arjdbc/mssql/extensions/calculations.rb

@@ -0,0 +1,29 @@
+require 'active_record/relation'
+require 'active_record/version'
+
+# NOTE: some improvements in active record  broke sql calculations and habtm
+# associations for this adapter and the supporting arel visitor.
+# this extension fixes this issue in rails 5.1.4 onwards
+#
+# https://github.com/rails/rails/pull/29848
+# https://github.com/rails/rails/pull/30686
+
+module ActiveRecord
+  module ConnectionAdapters
+    module MSSQL
+      module Calculations
+        private
+
+        def build_count_subquery(relation, column_name, distinct)
+          super(relation.unscope(:order), column_name, distinct)
+        end
+
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load(:active_record) do
+  mod = ActiveRecord::ConnectionAdapters::MSSQL::Calculations
+  ActiveRecord::Relation.prepend(mod)
+end

data/lib/arjdbc/mssql/schema_creation.rb

@@ -15,6 +15,18 @@ module ActiveRecord
           end
         end
 
+        def add_column_options!(sql, options)
+          sql << " DEFAULT #{quote_default_expression(options[:default], options[:column])}" if options_include_default?(options)
+
+          sql << ' NOT NULL' if options[:null] == false
+
+          sql << ' IDENTITY(1,1)' if options[:is_identity] == true
+
+          sql << ' PRIMARY KEY' if options[:primary_key] == true
+
+          sql
+        end
+
         # There is no RESTRICT in MSSQL but it has NO ACTION which behave
         # same as RESTRICT, added this behave according rails api.
         def action_sql(action, dependency)

data/lib/arjdbc/mssql/schema_definitions.rb

@@ -2,6 +2,14 @@ module ActiveRecord
   module ConnectionAdapters
     module MSSQL
       module ColumnMethods
+        def primary_key(name, type = :primary_key, **options)
+          if [:integer, :bigint].include?(type)
+            options[:is_identity] = true unless options.key?(:default)
+          end
+
+          super
+        end
+
         # datetime with seconds always zero (:00) and without fractional seconds
         def smalldatetime(*args, **options)
           args.each { |name| column(name, :smalldatetime, options) }
@@ -64,6 +72,15 @@ module ActiveRecord
 
       class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition
         include ColumnMethods
+
+        def new_column_definition(name, type, **options)
+          case type
+          when :primary_key
+            options[:is_identity] = true
+          end
+
+          super
+        end
       end
 
       class Table < ActiveRecord::ConnectionAdapters::Table

data/lib/arjdbc/mssql/schema_dumper.rb

@@ -0,0 +1,37 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module MSSQL
+      module ColumnDumper # :nodoc:
+        MSSQL_NO_LIMIT_TYPES = [
+          'text',
+          'ntext',
+          'varchar(max)',
+          'nvarchar(max)',
+          'varbinary(max)'
+        ].freeze
+
+        private
+
+        def schema_limit(column)
+          return if MSSQL_NO_LIMIT_TYPES.include?(column.sql_type)
+
+          super
+        end
+
+        def explicit_primary_key_default?(column)
+          !column.identity?
+        end
+
+        def default_primary_key?(column)
+          super && column.identity?
+        end
+
+        # def schema_collation(column)
+        #   return unless column.collation
+        #   column.collation if column.collation != collation
+        # end
+
+      end
+    end
+  end
+end

data/lib/arjdbc/mssql/schema_statements.rb

@@ -5,7 +5,7 @@ module ActiveRecord
 
         NATIVE_DATABASE_TYPES = {
           # Logical Rails types to SQL Server types
-          primary_key:   'int NOT NULL IDENTITY(1,1) PRIMARY KEY',
+          primary_key:   'bigint NOT NULL IDENTITY(1,1) PRIMARY KEY',
           integer:       { name: 'int', limit: 4 },
           boolean:       { name: 'bit' },
           decimal:       { name: 'decimal' },
@@ -41,43 +41,16 @@ module ActiveRecord
           NATIVE_DATABASE_TYPES
         end
 
-        # Returns an array of table names defined in the database.
-        def tables(name = nil)
-          if name
-            ActiveSupport::Deprecation.warn(<<-MSG.squish)
-              Passing arguments to #tables is deprecated without replacement.
-            MSG
-          end
-
-          @connection.tables(nil, name)
-        end
-
         # Returns an array of Column objects for the table specified by +table_name+.
         # See the concrete implementation for details on the expected parameter values.
         # NOTE: This is ready, all implemented in the java part of adapter,
         # it uses MSSQLColumn, SqlTypeMetadata, etc.
         def columns(table_name)
-          log('JDBC: GETCOLUMNS', 'SCHEMA') { @connection.columns(table_name) }
+          @connection.columns(table_name)
         rescue => e
           raise translate_exception_class(e, nil)
         end
 
-        # Returns an array of view names defined in the database.
-        # (to be implemented)
-        def views
-          []
-        end
-
-        def table_exists?(table_name)
-          ActiveSupport::Deprecation.warn(<<-MSG.squish)
-            #table_exists? currently checks both tables and views.
-            This behavior is deprecated and will be changed with Rails 5.1 to only check tables.
-            Use #data_source_exists? instead.
-          MSG
-
-          tables.include?(table_name.to_s)
-        end
-
         # Returns an array of indexes for the given table.
         def indexes(table_name, name = nil)
           @connection.indexes(table_name, name)
@@ -96,7 +69,7 @@ module ActiveRecord
         end
 
         def collation
-          select_value "SELECT Collation = CAST(SERVERPROPERTY('Collation') AS NVARCHAR(128))"
+          @collation ||= select_value("SELECT Collation = CAST(SERVERPROPERTY('Collation') AS NVARCHAR(128))")
         end
 
         def current_database
@@ -178,10 +151,10 @@ module ActiveRecord
         end
 
         # @private these cannot specify a limit
-        NO_LIMIT_TYPES = %w(text binary boolean date)
+        NO_LIMIT_TYPES = %i[text binary boolean date].freeze
 
-        def type_to_sql(type, limit = nil, precision = nil, scale = nil)
-          type_s = type.to_s
+        # Maps logical Rails types to MSSQL-specific data types.
+        def type_to_sql(type, limit: nil, precision: nil, scale: nil, **) # :nodoc:
           # MSSQL's NVARCHAR(n | max) column supports either a number between 1 and
           # 4000, or the word "MAX", which corresponds to 2**30-1 UCS-2 characters.
           #
@@ -190,11 +163,14 @@ module ActiveRecord
           #
           # See: http://msdn.microsoft.com/en-us/library/ms186939.aspx
           #
-          if type_s == 'string' && limit == 1073741823
-            'NVARCHAR(MAX)'
-          elsif NO_LIMIT_TYPES.include?(type_s)
+          type = type.to_sym if type
+          native = native_database_types[type]
+
+          if type == :string && limit == 1_073_741_823
+            'nvarchar(max)'
+          elsif NO_LIMIT_TYPES.include?(type)
             super(type)
-          elsif type_s == 'integer' || type_s == 'int'
+          elsif %i[int integer].include?(type)
             if limit.nil? || limit == 4
               'int'
             elsif limit == 2
@@ -204,8 +180,22 @@ module ActiveRecord
             else
               'bigint'
             end
-          elsif type_s == 'uniqueidentifier'
-            type_s
+          elsif type == :uniqueidentifier
+            'uniqueidentifier'
+          elsif %i[datetime time].include?(type)
+            precision ||= 7
+            column_type_sql = (native.is_a?(Hash) ? native[:name] : native).dup
+            if (0..7).include?(precision)
+              column_type_sql << "(#{precision})"
+            else
+              raise(
+                ActiveRecordError,
+                "No #{native[:name]} type has precision of #{precision}. The " \
+                'allowed range of precision is from 0 to 7, even though the ' \
+                'sql type precision is 7 this adapter will persist up to 6 ' \
+                'precision only.'
+              )
+            end
           else
             super
           end
@@ -241,7 +231,11 @@ module ActiveRecord
           default = extract_new_default_value(default_or_changes)
           unless default.nil?
             column = columns(table_name).find { |c| c.name.to_s == column_name.to_s }
-            result = execute "ALTER TABLE #{quote_table_name(table_name)} ADD CONSTRAINT DF_#{table_name}_#{column_name} DEFAULT #{quote_default_expression(default, column)} FOR #{quote_column_name(column_name)}"
+            result = execute(
+              "ALTER TABLE #{quote_table_name(table_name)} " \
+              "ADD CONSTRAINT DF_#{table_name}_#{column_name} " \
+              "DEFAULT #{quote_default_expression(default, column)} FOR #{quote_column_name(column_name)}"
+            )
             result
           end
         end
@@ -257,11 +251,21 @@ module ActiveRecord
           end
 
           if !options[:null].nil? && options[:null] == false && !options[:default].nil?
-            execute "UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote_default_expression(options[:default], column)} WHERE #{quote_column_name(column_name)} IS NULL"
+            execute(
+              "UPDATE #{quote_table_name(table_name)} SET " \
+              "#{quote_column_name(column_name)}=#{quote_default_expression(options[:default], column)} " \
+              "WHERE #{quote_column_name(column_name)} IS NULL"
+            )
           end
 
           change_column_type(table_name, column_name, type, options)
-          change_column_default(table_name, column_name, options[:default]) if options_include_default?(options)
+
+          if options_include_default?(options)
+            change_column_default(table_name, column_name, options[:default])
+          elsif options.key?(:default) && options[:null] == false
+            # Drop default constraint when null option is false
+            remove_default_constraint(table_name, column_name)
+          end
 
           # add any removed indexes back
           indexes.each do |index|
@@ -280,7 +284,7 @@ module ActiveRecord
           end
           sql_alter = [
             "ALTER TABLE #{quoted_table}",
-            "ALTER COLUMN #{quoted_column} #{type_to_sql column.type, column.limit, column.precision, column.scale}",
+            "ALTER COLUMN #{quoted_column} #{type_to_sql(column.type, limit: column.limit, precision: column.precision, scale: column.scale)}",
             (' NOT NULL' unless null)
           ]
 
@@ -289,8 +293,33 @@ module ActiveRecord
 
         private
 
+        def data_source_sql(name = nil, type: nil)
+          scope = quoted_scope(name, type: type)
+          table_name = 'TABLE_NAME'
+
+          sql = "SELECT #{table_name}"
+          sql << ' FROM INFORMATION_SCHEMA.TABLES'
+          sql << ' WHERE TABLE_CATALOG = DB_NAME()'
+          sql << " AND TABLE_SCHEMA = #{quote(scope[:schema])}"
+          sql << " AND TABLE_NAME = #{quote(scope[:name])}" if scope[:name]
+          sql << " AND TABLE_TYPE = #{quote(scope[:type])}" if scope[:type]
+          sql << " ORDER BY #{table_name}"
+          sql
+        end
+
+        def quoted_scope(raw_name = nil, type: nil)
+          schema = ArJdbc::MSSQL::Utils.unqualify_table_schema(raw_name)
+          name = ArJdbc::MSSQL::Utils.unqualify_table_name(raw_name)
+
+          scope = {}
+          scope[:schema] = schema || 'dbo'
+          scope[:name] = name if name
+          scope[:type] = type if type
+          scope
+        end
+
         def change_column_type(table_name, column_name, type, options = {})
-          sql = "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
+          sql = "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} #{type_to_sql(type, limit: options[:limit], precision: options[:precision], scale: options[:scale])}"
           sql << (options[:null] ? " NULL" : " NOT NULL") if options.has_key?(:null)
           result = execute(sql)
           result

data/lib/arjdbc/mssql/types/date_and_time_types.rb

@@ -8,12 +8,12 @@ module ActiveRecord
 
         class DateTime2 < ActiveRecord::Type::DateTime
           def type_cast_for_schema(value)
-            return "'#{value}'" if value.acts_like?(:string)
+            return %("#{value}") if value.acts_like?(:string)
 
             if value.usec > 0
-              "'#{value.to_s(:db)}.#{value.usec.to_s.remove(/0+$/)}'"
+              %("#{value.to_s(:db)}.#{value.usec.to_s.remove(/0+$/)}")
             else
-              "'#{value.to_s(:db)}'"
+              %("#{value.to_s(:db)}")
             end
           end
 
@@ -49,12 +49,12 @@ module ActiveRecord
           end
 
           def type_cast_for_schema(value)
-            return "'#{value}'" if value.acts_like?(:string)
+            return %("#{value}") if value.acts_like?(:string)
 
             if value.usec > 0
-              "'#{value.to_s(:db)}.#{value.usec.to_s.remove(/0+$/)}'"
+              %("#{value.to_s(:db)}.#{value.usec.to_s.remove(/0+$/)}")
             else
-              "'#{value.to_s(:db)}'"
+              %("#{value.to_s(:db)}")
             end
           end
 
@@ -95,12 +95,12 @@ module ActiveRecord
 
         class Time < ActiveRecord::Type::Time
           def type_cast_for_schema(value)
-            return "'#{value}'" if value.acts_like?(:string)
+            return %("#{value}") if value.acts_like?(:string)
 
             if value.usec > 0
-              "'#{value.to_s(:db)}.#{value.usec.to_s.remove(/0+$/)}'"
+              %("#{value.to_s(:db)}.#{value.usec.to_s.remove(/0+$/)}")
             else
-              "'#{value.to_s(:db)}'"
+              %("#{value.to_s(:db)}")
             end
           end
 

data/lib/arjdbc/mssql/utils.rb

@@ -41,6 +41,7 @@ module ArJdbc
       end
 
       def unqualify_table_name(table_name)
+        return if table_name.blank?
         remove_identifier_delimiters(table_name.to_s.split('.').last)
       end
 

data/lib/arjdbc/mssql.rb

@@ -4,4 +4,4 @@ require 'arjdbc/mssql/connection_methods'
 module ArJdbc
   MsSQL = MSSQL # compatibility with 1.2
 end
-ArJdbc.warn_unsupported_adapter 'mssql', [5, 0] # warns on AR >= 4.2
+ArJdbc.warn_unsupported_adapter 'mssql', [5, 1] # warns on AR >= 4.2

data/lib/arjdbc/mysql/adapter.rb

@@ -61,6 +61,10 @@ module ActiveRecord
         true
       end
 
+      def supports_transaction_isolation?
+        true
+      end
+
       # HELPER METHODS ===========================================
 
       # Reloading the type map in abstract/statement_cache.rb blows up postgres
@@ -92,7 +96,14 @@ module ActiveRecord
 
       #--
       # QUOTING ==================================================
-      #++
+      #+
+
+      # FIXME: 5.1 crashes without this.  I think this is Arel hitting a fallback path in to_sql.rb.
+      # So maybe an untested code path in their source.  Still means we are doing something wrong to
+      # even hit it.
+      def quote(value, comment=nil)
+        super(value)
+      end
 
       # NOTE: quote_string(string) provided by ArJdbc::MySQL (native code),
       # this piece is also native (mysql2) under MRI: `@connection.escape(string)`

data/lib/arjdbc/mysql/connection_methods.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 ArJdbc::ConnectionMethods.module_eval do
   def mysql_connection(config)
-    config = config.deep_dup
     # NOTE: this isn't "really" necessary but Rails (in tests) assumes being able to :
     #   ActiveRecord::Base.mysql2_connection ActiveRecord::Base.configurations['arunit'].merge(database: ...)
     config = symbolize_keys_if_necessary(config)
@@ -11,9 +10,11 @@ ArJdbc::ConnectionMethods.module_eval do
 
     return jndi_connection(config) if jndi_config?(config)
 
-    driver = config[:driver]
-    mysql_driver = driver.nil? || driver.to_s.start_with?('com.mysql.')
-    mariadb_driver = ! mysql_driver && driver.to_s.start_with?('org.mariadb.')
+    driver = config[:driver] ||=
+      defined?(::Jdbc::MySQL.driver_name) ? ::Jdbc::MySQL.driver_name : 'com.mysql.jdbc.Driver'
+
+    mysql_driver = driver.start_with?('com.mysql.')
+    mariadb_driver = ! mysql_driver && driver.start_with?('org.mariadb.')
 
     begin
       require 'jdbc/mysql'
@@ -21,11 +22,6 @@ ArJdbc::ConnectionMethods.module_eval do
     rescue LoadError # assuming driver.jar is on the class-path
     end if mysql_driver
 
-    if driver.nil?
-      config[:driver] ||=
-        defined?(::Jdbc::MySQL.driver_name) ? ::Jdbc::MySQL.driver_name : 'com.mysql.jdbc.Driver'
-    end
-
     config[:username] = 'root' unless config.key?(:username)
     # jdbc:mysql://[host][,failoverhost...][:port]/[database]
     # - if the host name is not specified, it defaults to 127.0.0.1
@@ -40,8 +36,7 @@ ArJdbc::ConnectionMethods.module_eval do
 
     properties = ( config[:properties] ||= {} )
     if mysql_driver
-      properties['zeroDateTimeBehavior'] ||=
-        config[:driver].to_s.start_with?('com.mysql.cj.') ? 'CONVERT_TO_NULL' : 'convertToNull'
+      properties['zeroDateTimeBehavior'] ||= 'convertToNull'
       properties['jdbcCompliantTruncation'] ||= false
       # NOTE: this is "better" than passing what users are used to set on MRI
       # e.g. 'utf8mb4' will fail cause the driver will check for a Java charset
@@ -113,8 +108,7 @@ ArJdbc::ConnectionMethods.module_eval do
     rescue LoadError # assuming driver.jar is on the class-path
     end
 
-    config[:driver] ||=
-      defined?(::Jdbc::MariaDB.driver_name) ? ::Jdbc::MariaDB.driver_name : 'org.mariadb.jdbc.Driver'
+    config[:driver] ||= 'org.mariadb.jdbc.Driver'
 
     mysql_connection(config)
   end