diff options
author | Xavier Noria <fxn@hashref.com> | 2014-10-28 16:17:33 -0700 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2014-10-28 16:35:24 -0700 |
commit | b3bfa361c503e107aff4dee5edf79bd7fd3d3725 (patch) | |
tree | 4a9725f90708b45ff85e68b01335bbf94ee35f17 /activerecord/lib/active_record/connection_adapters/connection_specification.rb | |
parent | 777142d3a7b9ea36fcc8562613749299ac6dc243 (diff) | |
download | rails-b3bfa361c503e107aff4dee5edf79bd7fd3d3725.tar.gz rails-b3bfa361c503e107aff4dee5edf79bd7fd3d3725.tar.bz2 rails-b3bfa361c503e107aff4dee5edf79bd7fd3d3725.zip |
let's warn with heredocs
The current style for warning messages without newlines uses
concatenation of string literals with manual trailing spaces
where needed.
Heredocs have better readability, and with `squish` we can still
produce a single line.
This is a similar use case to the one that motivated defining
`strip_heredoc`, heredocs are super clean.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/connection_specification.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/connection_specification.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/connection_specification.rb index e02824b33d..af405fc690 100644 --- a/activerecord/lib/active_record/connection_adapters/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/connection_specification.rb @@ -1,4 +1,5 @@ require 'uri' +require 'active_support/core_ext/string/filters' module ActiveRecord module ConnectionAdapters @@ -221,8 +222,12 @@ module ActiveRecord # this ambiguous behaviour and in the future this function # can be removed in favor of resolve_url_connection. if configurations.key?(spec) || spec !~ /:/ - ActiveSupport::Deprecation.warn "Passing a string to ActiveRecord::Base.establish_connection " \ - "for a configuration lookup is deprecated, please pass a symbol (#{spec.to_sym.inspect}) instead" + ActiveSupport::Deprecation.warn(<<-MSG.squish) + Passing a string to ActiveRecord::Base.establish_connection for a + configuration lookup is deprecated, please pass a symbol + (#{spec.to_sym.inspect}) instead + MSG + resolve_symbol_connection(spec) else resolve_url_connection(spec) |