Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change Bullet's feature enable logic #738

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −6
Open

change Bullet's feature enable logic #738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,6 @@ Bullet.unused_eager_loading_enable = false
Bullet.counter_cache_enable = false
```

Note: When calling `Bullet.enable`, all other detectors are reset to their defaults (`true`) and need reconfiguring.

## Safe list

Sometimes Bullet may notify you of query problems you don't care to fix, or
Expand Down
24 changes: 20 additions & 4 deletions lib/bullet.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ def raise=(should_raise)
].freeze

def enable=(enable)
@enable = @n_plus_one_query_enable = @unused_eager_loading_enable = @counter_cache_enable = enable
@enable = enable

@n_plus_one_query_enable = true if @n_plus_one_query_enable.nil?
@unused_eager_loading_enable = true if @unused_eager_loading_enable.nil?
@counter_cache_enable = true if @counter_cache_enable.nil?

if enable?
reset_safelist
Expand All @@ -90,15 +94,27 @@ def app_root
end

def n_plus_one_query_enable?
enable? && !!@n_plus_one_query_enable
enable? && default_n_plus_one_query_enable?
end

def unused_eager_loading_enable?
enable? && !!@unused_eager_loading_enable
enable? && default_unused_eager_loading_enable?
end

def counter_cache_enable?
enable? && !!@counter_cache_enable
enable? && default_counter_cache_enable?
end

def default_n_plus_one_query_enable?
!!@n_plus_one_query_enable
end

def default_unused_eager_loading_enable?
!!@unused_eager_loading_enable
end

def default_counter_cache_enable?
!!@counter_cache_enable
end

def stacktrace_includes
Expand Down