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

optional database overrides in multicoop app_config

This commit is contained in:
wvengen 2014-04-05 10:41:45 +02:00
parent 852f3484ad
commit 0ed867b991
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/foodsoft_config.rb
View File

@ -44,7 +44,7 @@ class FoodsoftConfig
def setup_database
database_config = ActiveRecord::Base.configurations[Rails.env]
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)
end