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

Jump to bottom

Fix count method signature for active_record5 and active_record60 #700

Merged
merged 2 commits into from
Jan 18, 2024
Merged

Fix count method signature for active_record5 and active_record60 #700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f063cad
fix count method signature for active_record60
kaishuu0123 Jan 17, 2024
c673436
fix count method signature for active_record5
kaishuu0123 Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/bullet/active_record5.rb
View file
Open in desktop
Expand Up @@ -273,7 +273,7 @@ def count_records

::ActiveRecord::Associations::CollectionProxy.prepend(
Module.new do
def count
def count(column_name = nil)
if Bullet.start? && !proxy_association.is_a?(::ActiveRecord::Associations::ThroughAssociation)
Bullet::Detector::CounterCache.add_counter_cache(
proxy_association.owner,
Expand All @@ -284,7 +284,7 @@ def count
proxy_association.reflection.name
)
end
super
super(column_name)
end
end
)
Expand Down
4 changes: 2 additions & 2 deletions lib/bullet/active_record60.rb
View file
Open in desktop
Expand Up @@ -282,7 +282,7 @@ def count_records

::ActiveRecord::Associations::CollectionProxy.prepend(
Module.new do
def count
def count(column_name = nil)
if Bullet.start? && !proxy_association.is_a?(::ActiveRecord::Associations::ThroughAssociation)
Bullet::Detector::CounterCache.add_counter_cache(
proxy_association.owner,
Expand All @@ -293,7 +293,7 @@ def count
proxy_association.reflection.name
)
end
super
super(column_name)
end
end
)
Expand Down