diff options
| author | Alexander Balashov <divineforest@gmail.com> | 2013-03-28 18:52:14 +0400 |
|---|---|---|
| committer | Alexander Balashov <divineforest@gmail.com> | 2013-03-28 18:52:14 +0400 |
| commit | cec034396584df907fa00738e9c4326f70b16388 (patch) | |
| tree | bb53e6fd141fad9429c34f7427e55a46bd47658f /activerecord/lib | |
| parent | 5533994b335560f2bf6b1dc6aef995b37c4657e0 (diff) | |
| download | rails-cec034396584df907fa00738e9c4326f70b16388.tar.gz rails-cec034396584df907fa00738e9c4326f70b16388.tar.bz2 rails-cec034396584df907fa00738e9c4326f70b16388.zip | |
Fix typo: overriden => overriDDen
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/core.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index 1ed05c1bd4..db5e7b82ca 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -78,7 +78,7 @@ module ActiveRecord self.disable_implicit_join_references = false class_attribute :default_connection_handler, instance_writer: false - + def self.connection_handler Thread.current[:active_record_connection_handler] || self.default_connection_handler end @@ -444,7 +444,7 @@ module ActiveRecord end def init_changed_attributes - # Intentionally avoid using #column_defaults since overriden defaults (as is done in + # Intentionally avoid using #column_defaults since overridden defaults (as is done in # optimistic locking) won't get written unless they get marked as changed self.class.columns.each do |c| attr, orig_value = c.name, c.default |