[mysql] fix new_column and move Column#initialize + introduce a AR42 constant

Author: kares

lib/arjdbc/mysql/adapter.rb

@@ -2,13 +2,18 @@
 
 require 'bigdecimal'
 require 'active_record/connection_adapters/abstract/schema_definitions'
-require 'arjdbc/mysql/column'
-require 'arjdbc/mysql/bulk_change_table'
-require 'arjdbc/mysql/explain_support'
-require 'arjdbc/mysql/schema_creation' # AR 4.x
 
 module ArJdbc
   module MySQL
+
+    # @private
+    AR42 = ActiveRecord::VERSION::STRING >= '4.2'
+
+    require 'arjdbc/mysql/column'
+    require 'arjdbc/mysql/bulk_change_table'
+    require 'arjdbc/mysql/explain_support'
+    require 'arjdbc/mysql/schema_creation' # AR 4.x
+
     include BulkChangeTable if const_defined? :BulkChangeTable
 
     # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_connection_class
@@ -145,7 +150,7 @@ def case_sensitive_modifier(node)
     def case_sensitive_modifier(node, table_attribute)
       node = Arel::Nodes.build_quoted node, table_attribute
       Arel::Nodes::Bin.new(node)
-    end if ActiveRecord::VERSION::STRING > '4.2'
+    end if AR42
 
     def limited_update_conditions(where_sql, quoted_table_name, quoted_primary_key)
       where_sql
@@ -162,9 +167,14 @@ def initialize_schema_migrations_table
     # HELPER METHODS ===========================================
 
     # @private Only for Rails core compatibility.
-    def new_column(field, default, type, null, collation, extra = '')
+    def new_column(field, default, type, null, collation, extra = "")
       Column.new(field, default, type, null, collation, strict_mode?, extra)
-    end
+    end unless AR42
+
+    # @private Only for Rails core compatibility.
+    def new_column(field, default, cast_type, sql_type = nil, null = true, collation = "", extra = "")
+      Column.new(field, default, cast_type, sql_type, null, collation, strict_mode?, extra)
+    end if AR42
 
     # @private Only for Rails core compatibility.
     def error_number(exception)

lib/arjdbc/mysql/column.rb

@@ -10,6 +10,26 @@ def self.column_selector
     # @see ActiveRecord::ConnectionAdapters::JdbcColumn
     module Column
 
+      def initialize(name, default, sql_type = nil, null = true, collation = nil, strict = false, extra = '')
+        if name.is_a?(Hash)
+          super # first arg: config
+        else
+          @strict = strict; @collation = collation; @extra = extra
+          super(name, default, sql_type, null)
+          # base 4.1: (name, default, sql_type = nil, null = true)
+        end
+      end unless AR42
+
+      def initialize(name, default, cast_type, sql_type = nil, null = true, collation = nil, strict = false, extra = '')
+        if name.is_a?(Hash)
+          super # first arg: config
+        else
+          @strict = strict; @collation = collation; @extra = extra
+          super(name, default, cast_type, sql_type, null)
+          # base 4.2: (name, default, cast_type, sql_type = nil, null = true)
+        end
+      end if AR42
+
       attr_reader :collation, :strict, :extra
 
       def extract_default(default)