Commit 5864423a by Ryan Bigg

Merge pull request #259 from vaharoni/rails4

Fixed issue #258: uniqueness validator now works with custom active c…
parents bb98963b 5f158301
...@@ -269,7 +269,7 @@ module ActiveRecord ...@@ -269,7 +269,7 @@ module ActiveRecord
def build_relation_with_paranoia(klass, table, attribute, value) def build_relation_with_paranoia(klass, table, attribute, value)
relation = build_relation_without_paranoia(klass, table, attribute, value) relation = build_relation_without_paranoia(klass, table, attribute, value)
if klass.respond_to?(:paranoia_column) if klass.respond_to?(:paranoia_column)
relation.and(klass.arel_table[klass.paranoia_column].eq(nil)) relation.and(klass.arel_table[klass.paranoia_column].eq(klass.paranoia_sentinel_value))
else else
relation relation
end end
......
...@@ -38,7 +38,8 @@ def setup! ...@@ -38,7 +38,8 @@ def setup!
'namespaced_paranoid_has_ones' => 'deleted_at DATETIME, paranoid_belongs_tos_id INTEGER', 'namespaced_paranoid_has_ones' => 'deleted_at DATETIME, paranoid_belongs_tos_id INTEGER',
'namespaced_paranoid_belongs_tos' => 'deleted_at DATETIME, paranoid_has_one_id INTEGER', 'namespaced_paranoid_belongs_tos' => 'deleted_at DATETIME, paranoid_has_one_id INTEGER',
'unparanoid_unique_models' => 'name VARCHAR(32), paranoid_with_unparanoids_id INTEGER', 'unparanoid_unique_models' => 'name VARCHAR(32), paranoid_with_unparanoids_id INTEGER',
'active_column_models' => 'deleted_at DATETIME, active BOOLEAN' 'active_column_models' => 'deleted_at DATETIME, active BOOLEAN',
'active_column_model_with_uniqueness_validations' => 'name VARCHAR(32), deleted_at DATETIME, active BOOLEAN'
}.each do |table_name, columns_as_sql_string| }.each do |table_name, columns_as_sql_string|
ActiveRecord::Base.connection.execute "CREATE TABLE #{table_name} (id INTEGER NOT NULL PRIMARY KEY, #{columns_as_sql_string})" ActiveRecord::Base.connection.execute "CREATE TABLE #{table_name} (id INTEGER NOT NULL PRIMARY KEY, #{columns_as_sql_string})"
end end
...@@ -221,6 +222,19 @@ class ParanoiaTest < test_framework ...@@ -221,6 +222,19 @@ class ParanoiaTest < test_framework
assert_equal 1, model.class.deleted.count assert_equal 1, model.class.deleted.count
end end
def test_active_column_model_with_uniqueness_validation_only_checks_non_deleted_records
a = ActiveColumnModelWithUniquenessValidation.create!(name: "A")
a.destroy
b = ActiveColumnModelWithUniquenessValidation.new(name: "A")
assert b.valid?
end
def test_active_column_model_with_uniqueness_validation_still_works_on_non_deleted_records
a = ActiveColumnModelWithUniquenessValidation.create!(name: "A")
b = ActiveColumnModelWithUniquenessValidation.new(name: "A")
refute b.valid?
end
def test_sentinel_value_for_custom_sentinel_models def test_sentinel_value_for_custom_sentinel_models
model = CustomSentinelModel.new model = CustomSentinelModel.new
assert_equal 0, model.class.count assert_equal 0, model.class.count
...@@ -1032,6 +1046,25 @@ class ActiveColumnModel < ActiveRecord::Base ...@@ -1032,6 +1046,25 @@ class ActiveColumnModel < ActiveRecord::Base
end end
end end
class ActiveColumnModelWithUniquenessValidation < ActiveRecord::Base
validates :name, :uniqueness => true
acts_as_paranoid column: :active, sentinel_value: true
def paranoia_restore_attributes
{
deleted_at: nil,
active: true
}
end
def paranoia_destroy_attributes
{
deleted_at: current_time_from_proper_timezone,
active: nil
}
end
end
class NonParanoidModel < ActiveRecord::Base class NonParanoidModel < ActiveRecord::Base
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment