Ticket #5896: validates_uniqueness.diff

activerecord/test/fixtures/developer.rb

@@ -10 +10 @@
-  end
-end
-
+require 'ipaddr'
+
+# Convert the integer form of an IP to string
+def inet_ntoa(n)
+  n.nil? ? nil : ([n].pack("N").unpack("C*").join ".")
+end
+
-class Developer < ActiveRecord::Base
-  has_and_belongs_to_many :projects do
-    def find_most_recent
@@ -33 +40 @@
-
-  validates_inclusion_of :salary, :in => 50000..200000
-  validates_length_of    :name, :within => 3..20
+  
+  def machine_ip
+    inet_ntoa(read_attribute(:machine_ip))
+  end
+  
+  def machine_ip=(n)
+    write_attribute(:machine_ip, IPAddr.new(n).to_i)
+  end
-end
-
-DeveloperSalary = Struct.new(:amount)

activerecord/test/fixtures/developers.yml

@@ -2 +2 @@
-  id: 1
-  name: David
-  salary: 80000
+  machine_ip: 1179946852
-
-jamis:
-  id: 2
-  name: Jamis
-  salary: 150000
+  machine_ip: 1179946854
-
-<% for digit in 3..10 %>
-dev_<%= digit %>:

activerecord/test/fixtures/db_definitions/schema.rb

@@ -75 +75 @@
-      t.column :real_number, :real
-    end
-  end
+
+  add_column(:developers, :machine_ip, :integer)
-end

activerecord/test/validations_test.rb

@@ -369 +369 @@
-    assert t2.save, "should save with nil"
-  end
-
+  def test_validate_uniqueness_with_custom_accessors
+    david = Developer.find(1)
+    jamis = Developer.find(2)
+
+    assert_equal "70.84.143.100", david.machine_ip
+    assert_equal "70.84.143.102", jamis.machine_ip
+
+    jamis.machine_ip = "70.84.143.100"
+    assert jamis.valid?
+    Developer.validates_uniqueness_of(:machine_ip)
+    assert !jamis.valid?, "The integer value should be used for validation"
+  end
+
-  def test_validate_format
-    Topic.validates_format_of(:title, :content, :with => /^Validation\smacros \w+!$/, :message => "is bad data")
-
@@ -385 +398 @@
-
-    assert_raise(ArgumentError) { Topic.validates_format_of(:title, :content) }
-  end
-
+
-  # testing ticket #3142
-  def test_validate_format_numeric
-    Topic.validates_format_of(:title, :content, :with => /^[1-9][0-9]*$/, :message => "is bad data")

activerecord/lib/active_record/validations.rb

@@ -621 +621 @@
-        configuration = { :message => ActiveRecord::Errors.default_error_messages[:taken], :case_sensitive => true }
-        configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
-
-
+ 
-          if value.nil? || (configuration[:case_sensitive] || !columns_hash[attr_name.to_s].text?)
-            condition_sql = "#{record.class.table_name}.#{attr_name} #{attribute_condition(value)}"
-value
+record.send(:read_attribute, attr_name)
-          else
-            condition_sql = "LOWER(#{record.class.table_name}.#{attr_name}) #{attribute_condition(value)}"
-value
+record.send(:read_attribute, attr_name)
-          end
-          if scope = configuration[:scope]
-            Array(scope).map do |scope_item|