ar-query-matchers 0.5.2.pre.5 → 0.5.2.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aaeaac19a8660c885b5ac75c32077ab6b0f835c53aaefa1bb3d3b7bab701fd4
-  data.tar.gz: 3746c66186e7d067fc82895a8d7bb90dc230eb7ddef7553ad2bb9631bd69d097
+  metadata.gz: a03e79681fb7644c916a5f3c019a5e9484f8b7176e21b6c91beae9bd2d9eb520
+  data.tar.gz: 1a1d6f97aab26efa604ae32dd2d4b56164e4616ff87b2ffbfb84812e87e57a75
 SHA512:
-  metadata.gz: 7d43af021387d6a1ea871bf13d876a512e19cf98eb702f85f9ff0446970c8f6bfbf40356d1eb0c1417664fd8b47ab4e8aab115785f06f8f22f547ab284dfa809
-  data.tar.gz: f8785fb4accfb4f7a2573ced84211769793cc72bb6784de3884665f39a63346ebcc83046e737e6fca3e56a9fd1dbafc563805800b49df32ee77951137c76f8aa
+  metadata.gz: 960fb79a70f3875f606d67364227ad6b0af6440b18fed4e885a8a44614d61f484ad7cdc33e6040b114b568d320edcc045a212a9db0c570577a039bb7a04b09c6
+  data.tar.gz: 379ef8320c724772bcf9fc38dda46a86fa8a24a8690a9547a13973065dcebef9fae17f77a636e059463f91afbba2aa341164ddadbe900e58fb625d3f1b64a5c4

data/lib/ar_query_matchers/queries/load_counter.rb

@@ -15,24 +15,12 @@ module ArQueryMatchers
       end
 
       class LoadQueryFilter < Queries::QueryFilter
-        # Matches named SQL operations like the following:
-        # 'User Load'
-        MODEL_LOAD_PATTERN = /\A(?<model_name>[\w:]+) (Load|Exists)\Z/.freeze
-
         # Matches unnamed SQL operations like the following:
-        # "SELECT COUNT(*) FROM `users` ..."
-        MODEL_SQL_PATTERN = /FROM [`"](?<table_name>[^`"]+)[`"]/.freeze
+        # "SELECT * FROM `users` ..."
+        MODEL_SQL_PATTERN = /SELECT (?:(?!SELECT).)* FROM [`"](?<table_name>[^`"]+)[`"]/.freeze
 
         def filter_map(_name, sql)
-          # First check for a `SELECT * FROM` query that ActiveRecord has
-          # helpfully named for us in the payload
-          #
-          # NOTE: This misses possible subqueries and prevents us from getting
-          # to the below matcher
-          # match = name.match(MODEL_LOAD_PATTERN)
-          # return [ModelName.new(match[:model_name])] if match
-
-          # Fall back to pattern-matching on the table name in a COUNT and looking
+          # Pattern-matching on the table name in a SELECT ... FROM and looking
           # up the table name from ActiveRecord's loaded descendants.
           selects_from_table = sql.scan(MODEL_SQL_PATTERN)
           selects_from_table.map { |(table_name)| TableName.new(table_name) } unless selects_from_table.empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar-query-matchers
 version: !ruby/object:Gem::Version
-  version: 0.5.2.pre.5
+  version: 0.5.2.pre.6
 platform: ruby
 authors:
 - Matan Zruya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-25 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord