diff options
author | Rafael Mendonça França <rafael@franca.dev> | 2019-07-25 17:18:41 -0400 |
---|---|---|
committer | Rafael Mendonça França <rafael@franca.dev> | 2019-07-25 17:18:41 -0400 |
commit | 579864f79ce1e7b9e4cae0518ddb65b5dd456b8c (patch) | |
tree | e1ad99c96749c66ccb94799c70e307b404247fb5 /activerecord/lib/active_record | |
parent | 59c6d29ffac990ab16e162d79aba12e13232a896 (diff) | |
parent | 77daacf94d7d26c713d4412b68edb64260fc22d9 (diff) | |
download | rails-579864f79ce1e7b9e4cae0518ddb65b5dd456b8c.tar.gz rails-579864f79ce1e7b9e4cae0518ddb65b5dd456b8c.tar.bz2 rails-579864f79ce1e7b9e4cae0518ddb65b5dd456b8c.zip |
Merge pull request #36380 from edudepetris/ed/36272-better-negative-scope-warning
Add a warning for enum elements with 'not_' prefix.
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/enum.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/enum.rb b/activerecord/lib/active_record/enum.rb index 8077630aeb..fc49f752aa 100644 --- a/activerecord/lib/active_record/enum.rb +++ b/activerecord/lib/active_record/enum.rb @@ -200,6 +200,8 @@ module ActiveRecord # scope :active, -> { where(status: 0) } # scope :not_active, -> { where.not(status: 0) } if enum_scopes != false + klass.send(:detect_negative_condition!, value_method_name) + klass.send(:detect_enum_conflict!, name, value_method_name, true) klass.scope value_method_name, -> { where(attr => value) } @@ -261,5 +263,12 @@ module ActiveRecord source: source } end + + def detect_negative_condition!(method_name) + if method_name.start_with?("not_") && logger + logger.warn "An enum element in #{self.name} uses the prefix 'not_'." \ + " This will cause a conflict with auto generated negative scopes." + end + end end end |