Changeset 3206

Timestamp:

12/02/05 04:30:46 (4 years ago)

Author:

marcel

Message:

Allow validate_uniqueness_of to be scoped by more than just one column. Closes #1559.

Files:

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

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Allow validate_uniqueness_of to be scoped by more than just one column.  #1559. [jeremy@jthopple.com, Marcel Molina Jr.]
-
-* Firebird: active? and reconnect! methods for handling stale connections.  #428 [Ken Kunz <kennethkunz@gmail.com>]

trunk/activerecord/lib/active_record/validations.rb

@@ -472 +472 @@
-      #
-      #   class Person < ActiveRecord::Base
-
+
+
+
+
+
+
+
+
-      #   end
-      #
@@ -480 +487 @@
-      # Configuration options:
-      # * <tt>message</tt> - Specifies a custom error message (default is: "has already been taken")
-
-
-
-
+
+
+
+
+
-      def validates_uniqueness_of(*attr_names)
-        configuration = { :message => ActiveRecord::Errors.default_error_messages[:taken] }
@@ -492 +500 @@
-          condition_params = [value]
-          if scope = configuration[:scope]
-
-
-
+
+
+
+
+
-          end
-          unless record.new_record?

trunk/activerecord/test/validations_test.rb

@@ -279 +279 @@
-    r3 = t2.replies.create "title" => "r3", "content" => "hello world"
-    assert r3.valid?, "Saving r3"
+  end
+
+  def test_validate_uniqueness_with_scope_array
+    Reply.validates_uniqueness_of(:author_name, :scope => [:author_email_address, :parent_id])
+
+    t = Topic.create("title" => "The earth is actually flat!")
+ 
+    r1 = t.replies.create "author_name" => "jeremy", "author_email_address" => "jeremy@rubyonrails.com", "title" => "You're crazy!", "content" => "Crazy reply"
+    assert r1.valid?, "Saving r1"
+    
+    r2 = t.replies.create "author_name" => "jeremy", "author_email_address" => "jeremy@rubyonrails.com", "title" => "You're crazy!", "content" => "Crazy reply again..."
+    assert !r2.valid?, "Saving r2. Double reply by same author." 
+    
+    r2.author_email_address = "jeremy_alt_email@rubyonrails.com"
+    assert r2.save, "Saving r2 the second time." 
+    
+    r3 = t.replies.create "author_name" => "jeremy", "author_email_address" => "jeremy_alt_email@rubyonrails.com", "title" => "You're wrong", "content" => "It's cubic"
+    assert !r3.valid?, "Saving r3"
+    
+    r3.author_name = "jj"
+    assert r3.save, "Saving r3 the second time."
+    
+    r3.author_name = "jeremy"
+    assert !r3.save, "Saving r3 the third time."
-  end
-