diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2013-05-16 06:10:30 -0700 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2013-05-16 06:10:30 -0700 |
| commit | 70a36487830a6e47dadfe5893d9a5782782ff4ff (patch) | |
| tree | 120ed708115573be38cab4795f6b35291079ae9b | |
| parent | 99860582b2b1c0fc42bf84c52aac57b243d42678 (diff) | |
| parent | 2583e8ade8280d61f31ce4e20b1c0908dffb5b9b (diff) | |
| download | rails-70a36487830a6e47dadfe5893d9a5782782ff4ff.tar.gz rails-70a36487830a6e47dadfe5893d9a5782782ff4ff.tar.bz2 rails-70a36487830a6e47dadfe5893d9a5782782ff4ff.zip | |
Merge pull request #10640 from joelcogen/master
Fix detection of engine in rake db:load_config
| -rw-r--r-- | activerecord/lib/active_record/railtie.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index e36888d4a8..709ad5a2ad 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -44,7 +44,7 @@ module ActiveRecord ActiveRecord::Tasks::DatabaseTasks.migrations_paths = Rails.application.paths['db/migrate'].to_a ActiveRecord::Tasks::DatabaseTasks.fixtures_path = File.join Rails.root, 'test', 'fixtures' - if defined?(ENGINE_PATH) && engine = Rails::Engine.find(ENGINE_PATH) + if engine = Rails::Engine.find(find_engine_path(APP_RAKEFILE)) if engine.paths['db/migrate'].existent ActiveRecord::Tasks::DatabaseTasks.migrations_paths += engine.paths['db/migrate'].to_a end |