aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--activerecord/lib/active_record/associations/association_scope.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association_scope.rb b/activerecord/lib/active_record/associations/association_scope.rb
index b62a16ea3f..aa5551fe0c 100644
--- a/activerecord/lib/active_record/associations/association_scope.rb
+++ b/activerecord/lib/active_record/associations/association_scope.rb
@@ -101,7 +101,7 @@ module ActiveRecord
scope.includes! item.includes_values
scope.where_values += item.where_values
- scope.order_values += (item.order_values - scope.order_values)
+ scope.order_values |= item.order_values
end
end