mirror of
https://github.com/heartcombo/devise.git
synced 2022-11-09 12:18:31 -05:00
Fix deprecation warning on Rails 6.1
This commit is contained in:
parent
743b6937e2
commit
80423c8f01
1 changed files with 17 additions and 2 deletions
|
@ -86,9 +86,24 @@ RUBY
|
||||||
Rails::VERSION::MAJOR >= 5
|
Rails::VERSION::MAJOR >= 5
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def rails61_and_up?
|
||||||
|
Rails::VERSION::MAJOR > 6 || (Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR >= 1)
|
||||||
|
end
|
||||||
|
|
||||||
def postgresql?
|
def postgresql?
|
||||||
config = ActiveRecord::Base.configurations[Rails.env]
|
ar_config && ar_config['adapter'] == 'postgresql'
|
||||||
config && config['adapter'] == 'postgresql'
|
end
|
||||||
|
|
||||||
|
def ar_config
|
||||||
|
if ActiveRecord::Base.configurations.respond_to?(:configs_for)
|
||||||
|
if rails61_and_up?
|
||||||
|
ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: "primary").configuration_hash
|
||||||
|
else
|
||||||
|
ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, spec_name: "primary").config
|
||||||
|
end
|
||||||
|
else
|
||||||
|
ActiveRecord::Base.configurations[Rails.env]
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def migration_version
|
def migration_version
|
||||||
|
|
Loading…
Reference in a new issue