Ticket #11562: patch_fix_dynamic_finders_on_associations_with_include_and_order.diff

activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb

@@ -87 +87 @@
-                        :joins => @join_sql,
-                        :readonly => false,
-                        :order => @reflection.options[:order],
+                        :include => @reflection.options[:include],
-                        :limit => @reflection.options[:limit] } }
-        end
-

activerecord/lib/active_record/associations/has_many_association.rb

@@ -100 +100 @@
-          create_scoping = {}
-          set_belongs_to_association_for(create_scoping)
-          {
- 
+, :include => @reflection.options[:include]
-            :create => create_scoping
-          }
-        end

activerecord/lib/active_record/associations.rb

@@ -1488 +1488 @@
-        end
-
-        def order_tables(options)
-options[:order]
+[options[:order], scope(:find, :order) ].join(", ")
-          return [] unless order && order.is_a?(String)
-          order.scan(/([\.\w]+).?\./).flatten
-        end
-