Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #14609 from evanwhalen/enums_inheritance

Make enums distinct per class
Conflicts:
	activerecord/CHANGELOG.md
  • Loading branch information...
commit 222d207bcd14668baf5f02334a46800efd3f1d73 1 parent ff69589
@rafaelfranca rafaelfranca authored
View
7 activerecord/CHANGELOG.md
@@ -1,3 +1,10 @@
+* Fixed a problem where an enum would overwrite values of another enum
+ with the same name in an unrelated class.
+
+ Fixes #14607.
+
+ *Evan Whalen*
+
* Make possible to have an association called `records`.
Fixes #11645.
View
10 activerecord/lib/active_record/enum.rb
@@ -65,10 +65,13 @@ module ActiveRecord
#
# Where conditions on an enum attribute must use the ordinal value of an enum.
module Enum
- DEFINED_ENUMS = {} # :nodoc:
+ def self.extended(base)
+ base.class_attribute(:defined_enums)
+ base.defined_enums = {}
+ end
def enum_mapping_for(attr_name) # :nodoc:
- DEFINED_ENUMS[attr_name.to_s]
+ defined_enums[attr_name.to_s]
end
def enum(definitions)
@@ -122,9 +125,8 @@ def enum(definitions)
klass.send(:detect_enum_conflict!, name, value, true)
klass.scope value, -> { klass.where name => i }
end
-
- DEFINED_ENUMS[name.to_s] = enum_values
end
+ defined_enums[name.to_s] = enum_values
end
end
View
15 activerecord/test/cases/enum_test.rb
@@ -250,4 +250,19 @@ def self.name; 'Book'; end
valid_book = klass.new(status: "written")
assert valid_book.valid?
end
+
+ test "enums are distinct per class" do
+ Plane = Class.new(ActiveRecord::Base) do
+ enum status: [:grounded, :operational]
+ end
+ assert_equal({ "proposed" => 0, "written" => 1, "published" => 2 }, Book.statuses)
+ assert_equal({ "grounded" => 0, "operational" => 1 }, Plane.statuses)
+ end
+
+ test "enums are inheritable" do
+ Encyclopedia = Class.new(Book) do
+ enum status: [:published, :reprinted]
+ end
+ assert_equal({ "published" => 0, "reprinted" => 1 }, Encyclopedia.statuses)
+ end
end
Please sign in to comment.
Something went wrong with that request. Please try again.