diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2017-11-12 19:18:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-12 19:18:49 -0500 |
| commit | a45f234b028fd4dda5338e5073a3bf2b8bf2c6fd (patch) | |
| tree | 84e2fd89dbc7248b1853c11dc16100305fa9089b /activerecord | |
| parent | d2a04ccc40c456bc62de66f3f76a818874163245 (diff) | |
| parent | 87598c8c80f4cbeef114267d75c46f1c87ca057a (diff) | |
| download | rails-a45f234b028fd4dda5338e5073a3bf2b8bf2c6fd.tar.gz rails-a45f234b028fd4dda5338e5073a3bf2b8bf2c6fd.tar.bz2 rails-a45f234b028fd4dda5338e5073a3bf2b8bf2c6fd.zip | |
Merge pull request #30773 from y-yagi/fix_30765
Make automatically synchronize test schema work inside engine
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/migration.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index d12a979a7f..c13efa9d70 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -581,7 +581,8 @@ module ActiveRecord def load_schema_if_pending! if ActiveRecord::Migrator.needs_migration? || !ActiveRecord::Migrator.any_migrations? # Roundtrip to Rake to allow plugins to hook into database initialization. - FileUtils.cd Rails.root do + root = defined?(ENGINE_ROOT) ? ENGINE_ROOT : Rails.root + FileUtils.cd(root) do current_config = Base.connection_config Base.clear_all_connections! system("bin/rails db:test:prepare") |