diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-28 07:58:57 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-28 07:58:57 -0700 |
| commit | 9802cbe1f3c384bc2e5e30ea801193a2b77989f9 (patch) | |
| tree | 841106e4a3055d06110ee5d2e7b115911c746d56 /activerecord/lib/active_record | |
| parent | 15d97117e263b68e0fc936291124ea826d1e1cab (diff) | |
| parent | cec034396584df907fa00738e9c4326f70b16388 (diff) | |
| download | rails-9802cbe1f3c384bc2e5e30ea801193a2b77989f9.tar.gz rails-9802cbe1f3c384bc2e5e30ea801193a2b77989f9.tar.bz2 rails-9802cbe1f3c384bc2e5e30ea801193a2b77989f9.zip | |
Merge pull request #9972 from divineforest/fix-overriden-typo
Fix typo: overriden => overriDDen
Diffstat (limited to 'activerecord/lib/active_record')
| -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 |