Merge pull request #246 from codeodor/rails3

Fix "normal" validates_uniqueness_of after #122 broke it

Author: radar

lib/paranoia.rb

@@ -181,7 +181,7 @@ class UniquenessValidator < ActiveModel::EachValidator
       protected
       def build_relation_with_paranoia(klass, table, attribute, value)
         relation = build_relation_without_paranoia(klass, table, attribute, value)
-        relation.and(klass.quoted_table_name + ".#{klass.paranoia_column} IS NULL")
+        relation.and(klass.arel_table[klass.paranoia_column].eq(nil))
       end
       alias_method_chain :build_relation, :paranoia
     end

test/paranoia_test.rb

@@ -415,7 +415,7 @@ def test_restore_with_nil_has_one_association
 
     # Does it raise NoMethodException on restore of nil
     hasOne.restore(:recursive => true)
-    
+
     assert hasOne.reload.deleted_at.nil?
   end
 
@@ -434,14 +434,20 @@ def test_observers_not_notified_if_not_supported
     a.restore!
     # essentially, we're just ensuring that this doesn't crash
   end
-  
+
   def test_validates_uniqueness_only_checks_non_deleted_records
     a = Employer.create!(name: "A")
     a.destroy
     b = Employer.new(name: "A")
     assert b.valid?
   end
 
+  def test_validates_uniqueness_still_works_on_non_deleted_records
+    a = Employer.create!(name: "A")
+    b = Employer.new(name: "A")
+    refute b.valid?
+  end
+
   private
   def get_featureful_model
     FeaturefulModel.new(:name => 'not empty')