diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-12-16 17:05:16 -0200 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-12-16 17:05:16 -0200 |
commit | 4b669dbb9180c7f9740bc24dea403b82c8d6ddc9 (patch) | |
tree | 3ccc754c7bf487be10b7e07f8226b6df502e890e /activerecord/lib/rails/generators | |
parent | 97e413002639c1e19503f9c9875fc83428c36f51 (diff) | |
parent | b1c19eb05299fbae2a80beb4abacacc4b5340776 (diff) | |
download | rails-4b669dbb9180c7f9740bc24dea403b82c8d6ddc9.tar.gz rails-4b669dbb9180c7f9740bc24dea403b82c8d6ddc9.tar.bz2 rails-4b669dbb9180c7f9740bc24dea403b82c8d6ddc9.zip |
Merge branch 'master' into merge-action-cable
Diffstat (limited to 'activerecord/lib/rails/generators')
-rw-r--r-- | activerecord/lib/rails/generators/active_record/model/model_generator.rb | 9 |
1 files changed, 8 insertions, 1 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 395951ac9d..e4c9539362 100644 --- a/activerecord/lib/rails/generators/active_record/model/model_generator.rb +++ b/activerecord/lib/rails/generators/active_record/model/model_generator.rb @@ -43,9 +43,16 @@ module ActiveRecord # Used by the migration template to determine the parent name of the model def parent_class_name - options[:parent] || "ActiveRecord::Base" + options[:parent] || determine_default_parent_class end + def determine_default_parent_class + if File.exist?('app/models/application_record.rb') + "ApplicationRecord" + else + "ActiveRecord::Base" + end + end end end end |