diff options
author | Wojciech Wnętrzak <w.wnetrzak@gmail.com> | 2016-06-07 21:41:12 +0200 |
---|---|---|
committer | Wojciech Wnętrzak <w.wnetrzak@gmail.com> | 2016-06-08 08:52:12 +0200 |
commit | b991017bf1bfc2a9ca56f8b475f6f47b3ce99484 (patch) | |
tree | dda9d5557056928698dd26d2a76863b9cd341ba0 /activerecord/lib/rails | |
parent | 5eea500ecf5858048ec69dbecb70d3f90f2a1024 (diff) | |
download | rails-b991017bf1bfc2a9ca56f8b475f6f47b3ce99484.tar.gz rails-b991017bf1bfc2a9ca56f8b475f6f47b3ce99484.tar.bz2 rails-b991017bf1bfc2a9ca56f8b475f6f47b3ce99484.zip |
Generate application_record.rb file before model file
Previously model file was generated first, which resulted in
inheriting from `ActiveRecord::Base`, but since application_record.rb
is generated as well, it should already be used.
Diffstat (limited to 'activerecord/lib/rails')
-rw-r--r-- | activerecord/lib/rails/generators/active_record/model/model_generator.rb | 12 |
1 files changed, 2 insertions, 10 deletions
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 f191eff5bf..2ebdf3c19e 100644 --- a/activerecord/lib/rails/generators/active_record/model/model_generator.rb +++ b/activerecord/lib/rails/generators/active_record/model/model_generator.rb @@ -21,8 +21,8 @@ module ActiveRecord end def create_model_file - template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb") generate_application_record + template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb") end def create_module_file @@ -48,7 +48,7 @@ module ActiveRecord # Used by the migration template to determine the parent name of the model def parent_class_name - options[:parent] || determine_default_parent_class + options[:parent] || "ApplicationRecord" end def application_record_exist? @@ -64,14 +64,6 @@ module ActiveRecord 'app/models/application_record.rb' end end - - def determine_default_parent_class - if application_record_exist? - "ApplicationRecord" - else - "ActiveRecord::Base" - end - end end end end |