diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-06-13 11:25:55 -0400 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-06-13 11:25:55 -0400 |
| commit | e29eb9feb52f557513881c23e98eeee3ca49ddf6 (patch) | |
| tree | ba15641cf8a8e1ccb16ad928b7480b728eb02b57 /activerecord/lib | |
| parent | a9734859ce3b07a27f58169ec85fe8e3fc4b20fd (diff) | |
| parent | a11a3861b474ef642ac48796572d6276436c7eb0 (diff) | |
| download | rails-e29eb9feb52f557513881c23e98eeee3ca49ddf6.tar.gz rails-e29eb9feb52f557513881c23e98eeee3ca49ddf6.tar.bz2 rails-e29eb9feb52f557513881c23e98eeee3ca49ddf6.zip | |
Merge pull request #24756 from gsamokovarov/always-inherit-from-application-record
Always genererate models with ApplicationRecord parent
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/rails/generators/active_record/model/model_generator.rb | 4 |
1 files changed, 2 insertions, 2 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 2ebdf3c19e..0d72913258 100644 --- a/activerecord/lib/rails/generators/active_record/model/model_generator.rb +++ b/activerecord/lib/rails/generators/active_record/model/model_generator.rb @@ -27,8 +27,8 @@ module ActiveRecord def create_module_file return if regular_class_path.empty? - template 'module.rb', File.join('app/models', "#{class_path.join('/')}.rb") if behavior == :invoke generate_application_record + template 'module.rb', File.join('app/models', "#{class_path.join('/')}.rb") if behavior == :invoke end hook_for :test_framework @@ -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] || "ApplicationRecord" + options[:parent] || 'ApplicationRecord' end def application_record_exist? |