diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-01-02 12:30:58 +0100 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2016-01-02 12:30:58 +0100 |
| commit | a0a62da235e8d87795d6cef6613ddf440386b366 (patch) | |
| tree | a543f30813fd33496b4c0e9506c8a5c2d51b60e0 /activerecord/lib | |
| parent | 4d98b0d837b29d34355f3fcb3916b6ac4a8b1bef (diff) | |
| parent | 571b090a85b09422b4ed2744383b90ada433a2f0 (diff) | |
| download | rails-a0a62da235e8d87795d6cef6613ddf440386b366.tar.gz rails-a0a62da235e8d87795d6cef6613ddf440386b366.tar.bz2 rails-a0a62da235e8d87795d6cef6613ddf440386b366.zip | |
Merge pull request #22887 from y-yagi/application_record_in_plugin
correctly presence check of `application_record.rb` in plugin
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/rails/generators/active_record/model/model_generator.rb | 8 |
1 files changed, 7 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 15aecf28ca..7395839fca 100644 --- a/activerecord/lib/rails/generators/active_record/model/model_generator.rb +++ b/activerecord/lib/rails/generators/active_record/model/model_generator.rb @@ -45,7 +45,13 @@ module ActiveRecord def determine_default_parent_class application_record = nil - in_root { application_record = File.exist?('app/models/application_record.rb') } + in_root do + application_record = if mountable_engine? + File.exist?("app/models/#{namespaced_path}/application_record.rb") + else + File.exist?('app/models/application_record.rb') + end + end if application_record "ApplicationRecord" |