2 files changed, 10 insertions, 8 deletions
diff --git a/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb b/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
index 76182a3c24..8511531af7 100644
--- a/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
+++ b/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
@@ -1,5 +1,4 @@
 require "rails/generators/active_record"
-require "active_support/core_ext/regexp"
 
 module ActiveRecord
   module Generators # :nodoc:
@@ -14,12 +13,16 @@ module ActiveRecord
         migration_template @migration_template, "db/migrate/#{file_name}.rb"
       end
 
+      # TODO Change this to private once we've dropped Ruby 2.2 support.
+      # Workaround for Ruby 2.2 "private attribute?" warning.
       protected
         attr_reader :migration_action, :join_tables
 
-      # Sets the default migration template that is being used for the generation of the migration.
-      # Depending on command line arguments, the migration template and the table name instance
-      # variables are set up.
+      private
+
+        # Sets the default migration template that is being used for the generation of the migration.
+        # Depending on command line arguments, the migration template and the table name instance
+        # variables are set up.
         def set_local_assigns!
           @migration_template = "migration.rb"
           case file_name
@@ -41,7 +44,7 @@ module ActiveRecord
 
         def set_index_names
           attributes.each_with_index do |attr, i|
-            attr.index_name = [attr, attributes[i - 1]].map{ |a| index_name_for(a) }
+            attr.index_name = [attr, attributes[i - 1]].map { |a| index_name_for(a) }
           end
         end
 
@@ -53,7 +56,6 @@ module ActiveRecord
           end.to_sym
         end
 
-      private
         def attributes_with_index
           attributes.select { |a| !a.reference? && a.has_index? }
         end
diff --git a/activerecord/lib/rails/generators/active_record/model/model_generator.rb b/activerecord/lib/rails/generators/active_record/model/model_generator.rb
index f1ddc61688..a9df5212e3 100644
--- a/activerecord/lib/rails/generators/active_record/model/model_generator.rb
+++ b/activerecord/lib/rails/generators/active_record/model/model_generator.rb
@@ -33,7 +33,7 @@ module ActiveRecord
 
       hook_for :test_framework
 
-      protected
+      private
 
         def attributes_with_index
           attributes.select { |a| !a.reference? && a.has_index? }
@@ -41,7 +41,7 @@ module ActiveRecord
 
         # FIXME: Change this file to a symlink once RubyGems 2.5.0 is required.
         def generate_application_record
-          if self.behavior == :invoke && !application_record_exist?
+          if behavior == :invoke && !application_record_exist?
             template "application_record.rb", application_record_file_name
           end
         end