Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

x_11_file_import_via_plugin #65

Open
flip wants to merge 65 commits from x_11_file_import_via_plugin into develop
pull from: x_11_file_import_via_plugin
merge into: Foodsoft:develop
Conversation 0 Commits 65 Files changed 463 +1 -1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 5cbe8dd968 - Show all commits

2
app/lib/foodsoft_config.rb
View file

@ -230,7 +230,7 @@ class FoodsoftConfig
end end
def setup_database def setup_database
database_config = ActiveRecord::Base.configurations[Rails.env] database_config = ActiveRecord::Base.configurations.find_db_config(Rails.env).configuration_hash
database_config = database_config.merge(config[:database]) if config[:database].present? database_config = database_config.merge(config[:database]) if config[:database].present?
ActiveRecord::Base.establish_connection(database_config) ActiveRecord::Base.establish_connection(database_config)
end end