aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/enum.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-11-08 10:42:01 +0900
committerRyuta Kamizono <kamipo@gmail.com>2018-11-08 10:42:01 +0900
commit6ee0d8f75dd9608e305491b54e6962f4ccba60a5 (patch)
tree9d352e74091acd7a16d78276b98ce0e276f78887 /activerecord/lib/active_record/enum.rb
parent5df4efd2fd08dfdf8583bcb6a4322aa5997c18e1 (diff)
parent25f1cbdecd4f506b46a6c476f18074dafdb581f2 (diff)
downloadrails-6ee0d8f75dd9608e305491b54e6962f4ccba60a5.tar.gz
rails-6ee0d8f75dd9608e305491b54e6962f4ccba60a5.tar.bz2
rails-6ee0d8f75dd9608e305491b54e6962f4ccba60a5.zip
Merge pull request #34385 from christophemaximin/guard-enum-empty-keys
Guard Enums against definitions with blank label names
Diffstat (limited to 'activerecord/lib/active_record/enum.rb')
-rw-r--r--activerecord/lib/active_record/enum.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/enum.rb b/activerecord/lib/active_record/enum.rb
index 3d97e4e513..3a600835e1 100644
--- a/activerecord/lib/active_record/enum.rb
+++ b/activerecord/lib/active_record/enum.rb
@@ -218,6 +218,10 @@ module ActiveRecord
MSG
raise ArgumentError, error_message
end
+
+ if values.is_a?(Hash) && values.keys.any?(&:blank?) || values.is_a?(Array) && values.any?(&:blank?)
+ raise ArgumentError, "Enum label name must not be blank."
+ end
end
ENUM_CONFLICT_MESSAGE = \