Skip to content

Commit

Permalink
Revert "fixed broken check for database adapter in rails/libraries/ra…
Browse files Browse the repository at this point in the history
…ils_configuration.rb"

This reverts commit 2d5afb4.
  • Loading branch information
githuesch committed May 14, 2014
1 parent 811555d commit ec0a84e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion rails/libraries/rails_configuration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def self.determine_database_adapter(app_name, app_config, app_root_path, options

# ensure that if a customer has set an adapter in the custom JSON,
# it will not be not overridden
return adapter if adapter && adapter != 'mysql'
return adapter unless ['postgresql', 'mysql'].include? adapter

return 'mysql2' unless options[:force]

Expand Down

0 comments on commit ec0a84e

Please sign in to comment.