Merge pull request #49483 from fatkodima/fix-uniq-validation-for-expr…

…-indexes Fix uniqueness validation to correctly work with expression indexes
rails · Oct 4, 2023 · bfc686f · bfc686f
1 parent 48b8372
commit bfc686f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/activerecord/lib/active_record/validations/uniqueness.rb b/activerecord/lib/active_record/validations/uniqueness.rb
@@ -87,7 +87,7 @@ def covered_by_unique_index?(klass, record, attribute, scope)
           klass.connection.schema_cache.indexes(klass.table_name).any? do |index|
             index.unique &&
               index.where.nil? &&
-              (index.columns - attributes).empty?
+              (Array(index.columns) - attributes).empty?
           end
         end
 

diff --git a/activerecord/test/cases/validations/uniqueness_validation_test.rb b/activerecord/test/cases/validations/uniqueness_validation_test.rb
@@ -812,6 +812,20 @@ def test_index_of_columns_list_and_extra_columns
       t.valid?
     end
   end
+
+  if current_adapter?(:PostgreSQLAdapter)
+    def test_expression_index
+      Topic.validates_uniqueness_of(:title)
+      @connection.add_index(:topics, "LOWER(title)", unique: true, name: :topics_index)
+
+      t = Topic.create!(title: "abc", author_name: "John")
+      t.content = "hello world"
+
+      assert_queries(1) do
+        t.valid?
+      end
+    end
+  end
 end
 
 class UniquenessWithCompositeKey < ActiveRecord::TestCase