diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-01-31 20:53:50 +0100 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2016-01-31 20:53:50 +0100 |
| commit | 81052c8cd908a0626a7ef77bb5c3dc89898b3626 (patch) | |
| tree | 2314e5ecfd46a4f7c3ffa5e7390efba48ec9fe2f /activerecord | |
| parent | 662889cf3621a9d536ec4a7e876c510b0ac3f946 (diff) | |
| parent | 3ffa5a15cc966c80029043c77adb3184422e33b3 (diff) | |
| download | rails-81052c8cd908a0626a7ef77bb5c3dc89898b3626.tar.gz rails-81052c8cd908a0626a7ef77bb5c3dc89898b3626.tar.bz2 rails-81052c8cd908a0626a7ef77bb5c3dc89898b3626.zip | |
Merge pull request #23169 from y-yagi/rake_proxy_in_engine
make rake proxy work in rails engines
Diffstat (limited to 'activerecord')
| -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 38916f7376..f4200e96b7 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -40,7 +40,7 @@ module ActiveRecord task :load_config do ActiveRecord::Tasks::DatabaseTasks.database_configuration = Rails.application.config.database_configuration - if defined?(ENGINE_PATH) && engine = Rails::Engine.find(ENGINE_PATH) + if defined?(ENGINE_ROOT) && engine = Rails::Engine.find(ENGINE_ROOT) if engine.paths['db/migrate'].existent ActiveRecord::Tasks::DatabaseTasks.migrations_paths += engine.paths['db/migrate'].to_a end |