aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/migration.rb
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-12-03 18:12:40 +0100
committerGitHub <noreply@github.com>2017-12-03 18:12:40 +0100
commitdde620ac6e959c32a6dc8e59911e8f6ffa088321 (patch)
tree9b8c3a18d74a32290f45e2d68d8b657a0313f951 /activerecord/lib/active_record/migration.rb
parent7609ca08ce5000689838eeb04ed37084bf364f78 (diff)
parentdbee80bca0ef504120219e6c7686437456511060 (diff)
downloadrails-dde620ac6e959c32a6dc8e59911e8f6ffa088321.tar.gz
rails-dde620ac6e959c32a6dc8e59911e8f6ffa088321.tar.bz2
rails-dde620ac6e959c32a6dc8e59911e8f6ffa088321.zip
Merge pull request #31311 from y-yagi/ignore_no_database_error_when_loading_schema_cache
Ignore `NoDatabaseError` when loading schema cache
Diffstat (limited to 'activerecord/lib/active_record/migration.rb')
-rw-r--r--activerecord/lib/active_record/migration.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index 15e9c09ffb..4d4b0dc67a 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -1053,7 +1053,15 @@ module ActiveRecord
end
end
- def current_version(connection = Base.connection)
+ def current_version(connection = nil)
+ if connection.nil?
+ begin
+ connection = Base.connection
+ rescue ActiveRecord::NoDatabaseError
+ return nil
+ end
+ end
+
get_all_versions(connection).max || 0
end