Skip to content

Revert small fix, caused issues #40

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

Merged
merged 1 commit into from
May 9, 2025
Merged

Revert small fix, caused issues #40

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: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.9.1
0.9.2
4 changes: 2 additions & 2 deletions lib/ar_query_matchers/queries/load_counter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def self.instrument(&block)
class LoadQueryFilter < Queries::QueryFilter
# Matches named SQL operations like the following:
# 'User Load'
MODEL_LOAD_PATTERN = /\A(?<field_name>[\w:]+)/
MODEL_LOAD_PATTERN = /\A(?<model_name>[\w:]+) (Load|Exists)\Z/

# Matches unnamed SQL operations like the following:
# "SELECT COUNT(*) FROM `users` ..."
Expand All @@ -27,7 +27,7 @@ def filter_map(name, sql)
# First check for a `SELECT * FROM` query that ActiveRecord has
# helpfully named for us in the payload
match = name.match(MODEL_LOAD_PATTERN)
return ModelName.new(match[:model_name]) if match&.names&.include? :model_name
return ModelName.new(match[:model_name]) if match

# Fall back to pattern-matching on the table name in a COUNT and looking
# up the table name from ActiveRecord's loaded descendants.
Expand Down