From 571b090a85b09422b4ed2744383b90ada433a2f0 Mon Sep 17 00:00:00 2001 From: "yuuji.yaginuma" Date: Sat, 2 Jan 2016 13:20:46 +0900 Subject: correctly presence check of `application_record.rb` in plugin --- .../lib/rails/generators/active_record/model/model_generator.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'activerecord/lib/rails/generators') 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" -- cgit v1.2.3