0
@@ -878,10 +878,10 @@ module ActiveRecord
0
 
0
           method_name = "has_one_after_save_for_#{reflection.name}".to_sym
0
           define_method(method_name) do
0
-            association = instance_variable_get("#{ivar}") if instance_variable_defined?("#{ivar}")
0
+            association = instance_variable_get(ivar) if instance_variable_defined?(ivar)
0
 
0
-            if !association.nil? && (new_record? || association.new_record? || association["#{reflection.primary_key_name}"] != id)
0
-              association["#{reflection.primary_key_name}"] = id
0
+            if !association.nil? && (new_record? || association.new_record? || association[reflection.primary_key_name] != id)
0
+              association[reflection.primary_key_name] = id
0
               association.save(true)
0
             end
0
           end
0
@@ -994,7 +994,7 @@ module ActiveRecord
0
 
0
           method_name = "polymorphic_belongs_to_before_save_for_#{reflection.name}".to_sym
0
           define_method(method_name) do
0
-            association = instance_variable_get("#{ivar}") if instance_variable_defined?("#{ivar}")
0
+            association = instance_variable_get(ivar) if instance_variable_defined?(ivar)
0
 
0
             if association && association.target
0
               if association.new_record?
0
@@ -1002,8 +1002,8 @@ module ActiveRecord
0
               end
0
 
0
               if association.updated?
0
-                self["#{reflection.primary_key_name}"] = association.id
0
-                self["#{reflection.options[:foreign_type]}"] = association.class.base_class.name.to_s
0
+                self[reflection.primary_key_name] = association.id
0
+                self[reflection.options[:foreign_type]] = association.class.base_class.name.to_s
0
               end
0
             end
0
           end
0
@@ -1015,7 +1015,7 @@ module ActiveRecord
0
 
0
           method_name = "belongs_to_before_save_for_#{reflection.name}".to_sym
0
           define_method(method_name) do
0
-            association = instance_variable_get("#{ivar}") if instance_variable_defined?("#{ivar}")
0
+            association = instance_variable_get(ivar) if instance_variable_defined?(ivar)
0
 
0
             if !association.nil?
0
               if association.new_record?
0
@@ -1023,7 +1023,7 @@ module ActiveRecord
0
               end
0
 
0
               if association.updated?
0
-                self["#{reflection.primary_key_name}"] = association.id
0
+                self[reflection.primary_key_name] = association.id
0
               end
0
             end
0
           end
0
@@ -1038,15 +1038,15 @@ module ActiveRecord
0
 
0
           method_name = "belongs_to_counter_cache_after_create_for_#{reflection.name}".to_sym
0
           define_method(method_name) do
0
-            association = send("#{reflection.name}")
0
-            association.class.increment_counter("#{cache_column}", send("#{reflection.primary_key_name}")) unless association.nil?
0
+            association = send(reflection.name)
0
+            association.class.increment_counter(cache_column, send(reflection.primary_key_name)) unless association.nil?
0
           end
0
           after_create method_name
0
 
0
           method_name = "belongs_to_counter_cache_before_destroy_for_#{reflection.name}".to_sym
0
           define_method(method_name) do
0
-            association = send("#{reflection.name}")
0
-            association.class.decrement_counter("#{cache_column}", send("#{reflection.primary_key_name}")) unless association.nil?
0
+            association = send(reflection.name)
0
+            association.class.decrement_counter(cache_column, send(reflection.primary_key_name)) unless association.nil?
0
           end
0
           before_destroy method_name
0
 
0
@@ -1329,19 +1329,19 @@ module ActiveRecord
0
             end
0
           end
0
         end
0
-        
0
+
0
         def add_single_associated_validation_callbacks(association_name)
0
           method_name = "validate_associated_records_for_#{association_name}".to_sym
0
           define_method(method_name) do
0
             association = instance_variable_get("@#{association_name}")
0
             if !association.nil?
0
-              errors.add "#{association_name}" unless association.target.nil? || association.valid?
0
+              errors.add association_name unless association.target.nil? || association.valid?
0
             end
0
           end
0
-        
0
+
0
           validate method_name
0
         end
0
-        
0
+
0
         def add_multiple_associated_validation_callbacks(association_name)
0
           method_name = "validate_associated_records_for_#{association_name}".to_sym
0
           ivar = "@#{association_name}"
0
@@ -1357,7 +1357,7 @@ module ActiveRecord
0
               else
0
                 association.target.select { |record| record.new_record? }
0
               end.each do |record|
0
-                errors.add "#{association_name}" unless record.valid?
0
+                errors.add association_name unless record.valid?
0
               end
0
             end
0
           end
0
@@ -1377,7 +1377,7 @@ module ActiveRecord
0
 
0
           method_name = "after_create_or_update_associated_records_for_#{association_name}".to_sym
0
           define_method(method_name) do
0
-            association = instance_variable_get("#{ivar}") if instance_variable_defined?("#{ivar}")
0
+            association = instance_variable_get(ivar) if instance_variable_defined?(ivar)
0
 
0
             records_to_save = if @new_record_before_save
0
               association
0
@@ -1444,7 +1444,7 @@ module ActiveRecord
0
               when :destroy
0
                 method_name = "has_many_dependent_destroy_for_#{reflection.name}".to_sym
0
                 define_method(method_name) do
0
-                  send("#{reflection.name}").each { |o| o.destroy }
0
+                  send(reflection.name).each { |o| o.destroy }
0
                 end
0
                 before_destroy method_name
0
               when :delete_all
0
@@ -1463,22 +1463,22 @@ module ActiveRecord
0
               when :destroy
0
                 method_name = "has_one_dependent_destroy_for_#{reflection.name}".to_sym
0
                 define_method(method_name) do
0
-                  association = send("#{reflection.name}")
0
+                  association = send(reflection.name)
0
                   association.destroy unless association.nil?
0
                 end
0
                 before_destroy method_name
0
               when :delete
0
                 method_name = "has_one_dependent_delete_for_#{reflection.name}".to_sym
0
                 define_method(method_name) do
0
-                  association = send("#{reflection.name}")
0
+                  association = send(reflection.name)
0
                   association.class.delete(association.id) unless association.nil?
0
                 end
0
                 before_destroy method_name
0
               when :nullify
0
                 method_name = "has_one_dependent_nullify_for_#{reflection.name}".to_sym
0
                 define_method(method_name) do
0
-                  association = send("#{reflection.name}")
0
-                  association.update_attribute("#{reflection.primary_key_name}", nil) unless association.nil?
0
+                  association = send(reflection.name)
0
+                  association.update_attribute(reflection.primary_key_name, nil) unless association.nil?
0
                 end
0
                 before_destroy method_name
0
               else
0
@@ -1493,14 +1493,14 @@ module ActiveRecord
0
               when :destroy
0
                 method_name = "belongs_to_dependent_destroy_for_#{reflection.name}".to_sym
0
                 define_method(method_name) do
0
-                  association = send("#{reflection.name}")
0
+                  association = send(reflection.name)
0
                   association.destroy unless association.nil?
0
                 end
0
                 before_destroy method_name
0
               when :delete
0
                 method_name = "belongs_to_dependent_delete_for_#{reflection.name}".to_sym
0
                 define_method(method_name) do
0
-                  association = send("#{reflection.name}")
0
+                  association = send(reflection.name)
0
                   association.class.delete(association.id) unless association.nil?
0
                 end
0
                 before_destroy method_name
0
@@ -1535,7 +1535,7 @@ module ActiveRecord
0
 
0
           create_reflection(:has_one, association_id, options, self)
0
         end
0
-        
0
+
0
         def create_has_one_through_reflection(association_id, options)
0
           options.assert_valid_keys(
0
             :class_name, :foreign_key, :remote, :select, :conditions, :order, :include, :dependent, :counter_cache, :extend, :as, :through, :source, :source_type, :validate
0
@@ -1927,7 +1927,7 @@ module ActiveRecord
0
             end
0
 
0
             def aliased_primary_key
0
-              "#{ aliased_prefix }_r0"
0
+              "#{aliased_prefix}_r0"
0
             end
0
 
0
             def aliased_table_name
0
@@ -1939,7 +1939,7 @@ module ActiveRecord
0
                 @column_names_with_alias = []
0
 
0
                 ([primary_key] + (column_names - [primary_key])).each_with_index do |column_name, i|
0
-                  @column_names_with_alias << [column_name, "#{ aliased_prefix }_r#{ i }"]
0
+                  @column_names_with_alias << [column_name, "#{aliased_prefix}_r#{i}"]
0
                 end
0
               end
0
 
0
@@ -1976,11 +1976,11 @@ module ActiveRecord
0
               @aliased_prefix     = "t#{ join_dependency.joins.size }"
0
               @parent_table_name  = parent.active_record.table_name
0
               @aliased_table_name = aliased_table_name_for(table_name)
0
-              
0
+
0
               if reflection.macro == :has_and_belongs_to_many
0
                 @aliased_join_table_name = aliased_table_name_for(reflection.options[:join_table], "_join")
0
               end
0
-        
0
+
0
               if [:has_many, :has_one].include?(reflection.macro) && reflection.options[:through]
0
                 @aliased_join_table_name = aliased_table_name_for(reflection.through_reflection.klass.table_name, "_join")
0
               end
0
@@ -2117,7 +2117,7 @@ module ActiveRecord
0
             end
0
 
0
             protected
0
-            
0
+
0
               def aliased_table_name_for(name, suffix = nil)
0
                 if !parent.table_joins.blank? && parent.table_joins.to_s.downcase =~ %r{join(\s+\w+)?\s+#{name.downcase}\son}
0
                   @join_dependency.table_aliases[name] += 1
0
@@ -2135,7 +2135,7 @@ module ActiveRecord
0
 
0
                 name
0
               end
0
-              
0
+
0
               def pluralize(table_name)
0
                 ActiveRecord::Base.pluralize_table_names ? table_name.to_s.pluralize : table_name
0
               end