diff options
author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2018-08-29 11:07:01 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-29 11:07:01 -0400 |
commit | 55133a0e8e618ae9c21e842dcc5554d1a46eb79a (patch) | |
tree | 85e79065acb3490a746bc20a187c9ff973f793eb /railties/lib | |
parent | 068fe7dc9045856b822833db5cb7cb690e6000d7 (diff) | |
parent | 6b5df90fb56d86f0cd04a27a94dfe876e21fa001 (diff) | |
download | rails-55133a0e8e618ae9c21e842dcc5554d1a46eb79a.tar.gz rails-55133a0e8e618ae9c21e842dcc5554d1a46eb79a.tar.bz2 rails-55133a0e8e618ae9c21e842dcc5554d1a46eb79a.zip |
Merge pull request #33748 from eileencodes/fix-erb-loading-issue-with-db-yaml
Drop load_database_yaml and fix test
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/application/configuration.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 9eb07219e0..f4cbd2b9d0 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -168,18 +168,6 @@ module Rails end end - # Loads the database YAML without evaluating ERB. People seem to - # write ERB that makes the database configuration depend on - # Rails configuration. But we want Rails configuration (specifically - # `rake` and `rails` tasks) to be generated based on information in - # the database yaml, so we need a method that loads the database - # yaml *without* the context of the Rails application. - def load_database_yaml # :nodoc: - path = paths["config/database"].existent.first - return {} unless path - YAML.load_file(path.to_s) - end - # Loads and returns the entire raw configuration of database from # values stored in <tt>config/database.yml</tt>. def database_configuration |