Changeset 9160

Timestamp:

03/31/08 01:50:07 (3 months ago)

Author:

bitsweat

Message:

Fix case-sensitive validates_uniqueness_of. Closes #11366 [miloops]

Files:

• trunk/activerecord/lib/active_record/validations.rb (modified) (3 diffs)
• trunk/activerecord/test/cases/validations_test.rb (modified) (1 diff)

trunk/activerecord/lib/active_record/validations.rb

@@ -603 +603 @@
-      # Configuration options:
-      # * <tt>message</tt> - Specifies a custom error message (default is: "has already been taken")
-
-tru
+e
+fals
-      # * <tt>allow_nil</tt> - If set to true, skips this validation if the attribute is null (default is: false)
-      # * <tt>allow_blank</tt> - If set to true, skips this validation if the attribute is blank (default is: false)
@@ -614 +614 @@
-      #   method, proc or string should return or evaluate to a true or false value.
-      def validates_uniqueness_of(*attr_names)
-, :case_sensitive => true
+
-        configuration.update(attr_names.extract_options!)
-
-        validates_each(attr_names,configuration) do |record, attr_name, value|
-          if value.nil? || (configuration[:case_sensitive] || !columns_hash[attr_name.to_s].text?)
-            condition_sql = "#{record.class.quoted_table_name}.#{attr_name} #{attribute_condition(value)}"
-            condition_params = [value]
-          else
-            condition_sql = "LOWER(#{record.class.quoted_table_name}.#{attr_name}) #{attribute_condition(value)}"
-            condition_params = [value.downcase]
-          end
-
-          if scope = configuration[:scope]
-            Array(scope).map do |scope_item|
-              scope_value = record.send(scope_item)
-              condition_sql << " AND #{record.class.quoted_table_name}.#{scope_item} #{attribute_condition(scope_value)}"
-              condition_params << scope_value
-            end
-          end
-
-          unless record.new_record?
-            condition_sql << " AND #{record.class.quoted_table_name}.#{record.class.primary_key} <> ?"
-            condition_params << record.send(:id)
-          end
-
-          # The check for an existing value should be run from a class that
-          # isn't abstract. This means working down from the current class
@@ -653 +632 @@
-          finder_class = class_hierarchy.detect { |klass| !klass.abstract_class? }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-          end
-        end

trunk/activerecord/test/cases/validations_test.rb

@@ -436 +436 @@
-    assert t2.valid?, "should validate with nil"
-    assert t2.save, "should save with nil"
+  end
+
+  def test_validate_case_sensitive_uniqueness
+    Topic.validates_uniqueness_of(:title, :case_sensitive => true, :allow_nil => true)
+
+    t = Topic.new("title" => "I'm unique!")
+    assert t.save, "Should save t as unique"
+
+    t.content = "Remaining unique"
+    assert t.save, "Should still save t as unique"
+
+    t2 = Topic.new("title" => "I'M UNIQUE!")
+    assert t2.valid?, "Should be valid"
+    assert t2.save, "Should save t2 as unique"
+    assert !t2.errors.on(:title)
+    assert !t2.errors.on(:parent_id)
+    assert_not_equal "has already been taken", t2.errors.on(:title)
+
+    t3 = Topic.new("title" => "I'M uNiQUe!")
+    assert t3.valid?, "Should be valid"
+    assert t3.save, "Should save t2 as unique"
+    assert !t3.errors.on(:title)
+    assert !t3.errors.on(:parent_id)
+    assert_not_equal "has already been taken", t3.errors.on(:title)
-  end
-