Merge pull request rails#47819 from Shopify/always-respect-explicitly-configured-query-constraints

Respect explicitly configured `query_constraints`

Author: eileencodes

activerecord/lib/active_record/persistence.rb

@@ -488,12 +488,12 @@ def update!(id = :all, attributes)
       def query_constraints(*columns_list)
         raise ArgumentError, "You must specify at least one column to be used in querying" if columns_list.empty?
 
-        @_query_constraints_list = columns_list.map(&:to_s)
+        @query_constraints_list = columns_list.map(&:to_s)
       end
 
       def query_constraints_list # :nodoc:
         @query_constraints_list ||= if base_class? || primary_key != base_class.primary_key
-          primary_key.is_a?(Array) ? primary_key : @_query_constraints_list
+          primary_key if primary_key.is_a?(Array)
         else
           base_class.query_constraints_list
         end

activerecord/test/cases/persistence_test.rb

@@ -1522,4 +1522,8 @@ def test_query_constraints_raises_an_error_when_no_columns_provided
       end
     end
   end
+
+  def test_child_class_with_query_constraints_overrides_parents
+    assert_equal(["clothing_type", "color", "size"], ClothingItem::Sized.query_constraints_list)
+  end
 end

activerecord/test/models/clothing_item.rb

@@ -6,3 +6,7 @@ class ClothingItem < ActiveRecord::Base
 
 class ClothingItem::Used < ClothingItem
 end
+
+class ClothingItem::Sized < ClothingItem
+  query_constraints :clothing_type, :color, :size
+end

activerecord/test/schema/schema.rb

@@ -260,6 +260,7 @@
     t.string :clothing_type
     t.string :color
     t.string :type
+    t.string :size
     t.text :description
 
     t.index [:clothing_type, :color], unique: true