fix ActiveRecordError refs in bulk_change_table.rb - make it more copy-paste friendly

Author: kares

lib/arjdbc/mysql/adapter.rb

@@ -18,6 +18,9 @@ module MySQL
 
     include BulkChangeTable if const_defined? :BulkChangeTable
 
+    # @private
+    ActiveRecordError = ::ActiveRecord::ActiveRecordError
+
     # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_connection_class
     def self.jdbc_connection_class
       ::ActiveRecord::ConnectionAdapters::MySQLJdbcConnection
@@ -586,7 +589,7 @@ def rename_column(table_name, column_name, new_column_name)
         options[:default] = column.default if type != :text && type != :binary
         options[:null] = column.null
       else
-        raise ActiveRecord::ActiveRecordError, "No such column: #{table_name}.#{column_name}"
+        raise ActiveRecordError, "No such column: #{table_name}.#{column_name}"
       end
 
       current_type = select_one("SHOW COLUMNS FROM #{quote_table_name(table_name)} LIKE '#{column_name}'")["Type"]
@@ -662,7 +665,7 @@ def type_to_sql(type, limit = nil, precision = nil, scale = nil)
         when 0..0xfff; "varbinary(#{limit})"
         when nil; "blob"
         when 0x1000..0xffffffff; "blob(#{limit})"
-        else raise ActiveRecord::ActiveRecordError, "No binary type has character length #{limit}"
+        else raise ActiveRecordError, "No binary type has character length #{limit}"
         end
       when 'integer'
         case limit
@@ -671,15 +674,15 @@ def type_to_sql(type, limit = nil, precision = nil, scale = nil)
         when 3; 'mediumint'
         when nil, 4, 11; 'int(11)' # compatibility with MySQL default
         when 5..8; 'bigint'
-        else raise ActiveRecord::ActiveRecordError, "No integer type has byte size #{limit}"
+        else raise ActiveRecordError, "No integer type has byte size #{limit}"
         end
       when 'text'
         case limit
         when 0..0xff; 'tinytext'
         when nil, 0x100..0xffff; 'text'
         when 0x10000..0xffffff; 'mediumtext'
         when 0x1000000..0xffffffff; 'longtext'
-        else raise ActiveRecord::ActiveRecordError, "No text type has character length #{limit}"
+        else raise ActiveRecordError, "No text type has character length #{limit}"
         end
       else
         super

lib/arjdbc/mysql/bulk_change_table.rb

@@ -3,10 +3,13 @@ module MySQL
     module BulkChangeTable
 
       # @private
-      AR41 = ActiveRecord::VERSION::STRING >= '4.1'
+      AR41 = ::ActiveRecord::VERSION::STRING >= '4.1'
 
       # @private
-      ChangeColumnDefinition = ActiveRecord::ConnectionAdapters::ChangeColumnDefinition if AR41
+      #ActiveRecordError = ActiveRecord::ActiveRecordError
+
+      # @private
+      ChangeColumnDefinition = ::ActiveRecord::ConnectionAdapters::ChangeColumnDefinition if AR41
 
       # @override
       def supports_bulk_alter?; true end
@@ -106,12 +109,12 @@ def rename_column_sql(table_name, column_name, new_column_name)
         schema_creation.accept ChangeColumnDefinition.new column, current_type, options
       end if AR41
 
-      def remove_column_sql(table_name, column_name, type = nil, options = {})
+      def remove_column_sql(table_name, column_name, type = nil, options = nil)
         "DROP #{quote_column_name(column_name)}"
       end
 
       def remove_columns_sql(table_name, *column_names)
-        column_names.map {|column_name| remove_column_sql(table_name, column_name) }
+        column_names.map { |column_name| remove_column_sql(table_name, column_name) }
       end
 
       def add_index_sql(table_name, column_name, options = {})