From cec034396584df907fa00738e9c4326f70b16388 Mon Sep 17 00:00:00 2001 From: Alexander Balashov Date: Thu, 28 Mar 2013 18:52:14 +0400 Subject: Fix typo: overriden => overriDDen --- activerecord/lib/active_record/core.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/lib/active_record/core.rb') 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 -- cgit v1.2.3