diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-16 13:15:38 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-16 13:15:38 -0300 |
commit | 4dc6b64c542f82270958976335e468d70246265c (patch) | |
tree | a37fbdb9912eb5195a836f0dfa66e5d307f66069 /activerecord/lib/active_record | |
parent | 92de6d4c359e970cf282fe6742633b8be06b998a (diff) | |
parent | 8de5f7e8a86292c83f0c202061dcea1d78e4ba09 (diff) | |
download | rails-4dc6b64c542f82270958976335e468d70246265c.tar.gz rails-4dc6b64c542f82270958976335e468d70246265c.tar.bz2 rails-4dc6b64c542f82270958976335e468d70246265c.zip |
Merge pull request #13963 from lucas-clemente/pending_migrations
Skip migration check if adapter doesn't support it
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/migration.rb | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index 481e5c17e4..01c001e692 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -366,16 +366,19 @@ module ActiveRecord # This class is used to verify that all migrations have been run before # loading a web page if config.active_record.migration_error is set to :page_load class CheckPending - def initialize(app) + def initialize(app, connection = Base.connection) @app = app + @connection = connection @last_check = 0 end def call(env) - mtime = ActiveRecord::Migrator.last_migration.mtime.to_i - if @last_check < mtime - ActiveRecord::Migration.check_pending! - @last_check = mtime + if @connection.supports_migrations? + mtime = ActiveRecord::Migrator.last_migration.mtime.to_i + if @last_check < mtime + ActiveRecord::Migration.check_pending!(@connection) + @last_check = mtime + end end @app.call(env) end |