diff options
| author | Arthur Nogueira Neves <github@arthurnn.com> | 2016-05-11 09:02:10 -0400 |
|---|---|---|
| committer | Arthur Nogueira Neves <github@arthurnn.com> | 2016-05-11 09:02:10 -0400 |
| commit | 733161d48b4292c8731c35eaa20131a49c5a5b9a (patch) | |
| tree | 5b3339fe050241eedf4cecaa17c09980ddde8f52 /activerecord/lib/active_record | |
| parent | 897decaceb0e48669391af7e20b7b7aff848e6d7 (diff) | |
| parent | f1030fd897640f2d051ee29143544fad5b64d6d3 (diff) | |
| download | rails-733161d48b4292c8731c35eaa20131a49c5a5b9a.tar.gz rails-733161d48b4292c8731c35eaa20131a49c5a5b9a.tar.bz2 rails-733161d48b4292c8731c35eaa20131a49c5a5b9a.zip | |
Merge pull request #24971 from arthurnn/arthurnn/dont_cache_specification_name
Dont cache the conn_spec_name when empty
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_handling.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_handling.rb b/activerecord/lib/active_record/connection_handling.rb index 74bbf6fc36..25306d6945 100644 --- a/activerecord/lib/active_record/connection_handling.rb +++ b/activerecord/lib/active_record/connection_handling.rb @@ -96,7 +96,7 @@ module ActiveRecord # Return the specification name from the current class or its parent. def connection_specification_name if !defined?(@connection_specification_name) || @connection_specification_name.nil? - @connection_specification_name = self == Base ? "primary" : superclass.connection_specification_name + return self == Base ? "primary" : superclass.connection_specification_name end @connection_specification_name end |