diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2013-05-16 15:52:12 +0200 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2013-05-16 15:52:12 +0200 |
| commit | 89f558c8c6a1f04883456fca573c27b8f72d09ab (patch) | |
| tree | e46b13e0c5bfac6ebeaa8084e767ee2ae67fdbcb | |
| parent | 1817c4fba16e715c38f49457ef52259bd95e8304 (diff) | |
| download | rails-89f558c8c6a1f04883456fca573c27b8f72d09ab.tar.gz rails-89f558c8c6a1f04883456fca573c27b8f72d09ab.tar.bz2 rails-89f558c8c6a1f04883456fca573c27b8f72d09ab.zip | |
Check if APP_RAKEFILE is defined
| -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 709ad5a2ad..31a0ace864 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 engine = Rails::Engine.find(find_engine_path(APP_RAKEFILE)) + if defined?(APP_RAKEFILE) && 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 |