Ticket #6485: polymorphic_sti_associations_1.2.3-tested.diff

activerecord/lib/active_record/associations/association_proxy.rb

@@ -100 +100 @@
-        def set_belongs_to_association_for(record)
-          if @reflection.options[:as]
-            record["#{@reflection.options[:as]}_id"]   = @owner.id unless @owner.new_record?
-base_class.
+
-          else
-            record[@reflection.primary_key_name] = @owner.id unless @owner.new_record?
-          end

activerecord/lib/active_record/associations/has_many_association.rb

@@ -187 +187 @@
-            when @reflection.options[:as]
-              @finder_sql = 
-                "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_id = #{@owner.quoted_id} AND " + 
-_value(@owner.class.base_class.name.to_s)
+ @owner.class.name.to_s
-              @finder_sql << " AND (#{conditions})" if conditions
-            
-            else

activerecord/lib/active_record/associations/has_one_association.rb

@@ -69 +69 @@
-            when @reflection.options[:as]
-              @finder_sql = 
-                "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_id = #{@owner.quoted_id} AND " + 
-_value(@owner.class.base_class.name.to_s)
+ @owner.class.name.to_s
-            else
-              @finder_sql = "#{@reflection.table_name}.#{@reflection.primary_key_name} = #{@owner.quoted_id}"
-          end

activerecord/lib/active_record/associations.rb

@@ -704 +704 @@
-                
-                if association.updated?
-                  self["#{reflection.primary_key_name}"] = association.id
-base_class.
+
-                end
-              end
-            EOF