Permalink
Browse files

Merge pull request #25998 from kamipo/enum_with_alias_attribute

Fix `enum` with `alias_attribute`
  • Loading branch information...
eileencodes committed Aug 6, 2016
2 parents 78a8774 + 83f0864 commit 6510f9980d93abc50b7673b0a73e02d066fab26c
Showing with 22 additions and 5 deletions.
  1. +6 −5 activerecord/lib/active_record/enum.rb
  2. +16 −0 activerecord/test/cases/enum_test.rb
@@ -161,8 +161,9 @@ def enum(definitions)
detect_enum_conflict!(name, name)
detect_enum_conflict!(name, "#{name}=")
decorate_attribute_type(name, :enum) do |subtype|
EnumType.new(name, enum_values, subtype)
attr = attribute_alias?(name) ? attribute_alias(name) : name
decorate_attribute_type(attr, :enum) do |subtype|
EnumType.new(attr, enum_values, subtype)
end
_enum_methods_module.module_eval do
@@ -184,15 +185,15 @@ def enum(definitions)
# def active?() status == 0 end
klass.send(:detect_enum_conflict!, name, "#{value_method_name}?")
define_method("#{value_method_name}?") { self[name] == value.to_s }
define_method("#{value_method_name}?") { self[attr] == value.to_s }
# def active!() update! status: :active end
klass.send(:detect_enum_conflict!, name, "#{value_method_name}!")
define_method("#{value_method_name}!") { update! name => value }
define_method("#{value_method_name}!") { update!(attr => value) }
# scope :active, -> { where status: 0 }
klass.send(:detect_enum_conflict!, name, value_method_name, true)
klass.scope value_method_name, -> { where(name => value) }
klass.scope value_method_name, -> { where(attr => value) }
end
end
defined_enums[name.to_s] = enum_values
@@ -393,6 +393,22 @@ def self.name; 'Book'; end
assert book2.single?
end
test "enum with alias_attribute" do
klass = Class.new(ActiveRecord::Base) do
self.table_name = "books"
alias_attribute :aliased_status, :status
enum aliased_status: [:proposed, :written, :published]
end
book = klass.proposed.create!
assert book.proposed?
assert_equal 'proposed', book.aliased_status
book = klass.find(book.id)
assert book.proposed?
assert_equal 'proposed', book.aliased_status
end
test "query state by predicate with prefix" do
assert @book.author_visibility_visible?
assert_not @book.author_visibility_invisible?

0 comments on commit 6510f99

Please sign in to comment.