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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a03e79681fb7644c916a5f3c019a5e9484f8b7176e21b6c91beae9bd2d9eb520
-  data.tar.gz: 1a1d6f97aab26efa604ae32dd2d4b56164e4616ff87b2ffbfb84812e87e57a75
+  metadata.gz: ab18e9a530a6577ba47fbc78341913bc83ec6c2976dfd3404be8819d346fcab8
+  data.tar.gz: 9801846663ecc57468f79a66a7c12f170f9ddb2fef79d35aa33c36910c8d9a8a
 SHA512:
-  metadata.gz: 960fb79a70f3875f606d67364227ad6b0af6440b18fed4e885a8a44614d61f484ad7cdc33e6040b114b568d320edcc045a212a9db0c570577a039bb7a04b09c6
-  data.tar.gz: 379ef8320c724772bcf9fc38dda46a86fa8a24a8690a9547a13973065dcebef9fae17f77a636e059463f91afbba2aa341164ddadbe900e58fb625d3f1b64a5c4
+  metadata.gz: aa331847dc1130257f6af7cc567e636ccedc8c7cecbd90383606f4c17050ab7c05546b51aa3cea040f1416082e45d98c04182341a13fddcfbbb66148183b9c43
+  data.tar.gz: 4becc7972b419b4e55d0f5cf55292ec8dfad6d6a1804bf9315c4368e842ec8a6c98506028b1ae7df41d2736f8a80b67fb745f1c9bb9e98328092db745baf8619

data/CHANGELOG.md

@@ -6,9 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.5.2] - 2021-05-18
+## [0.5.2] - 2021-05-26
 ### Changed
-- Removes 'SELECT' from MODEL_SQL_PATTERN to allow for more granular SQL statement matching
+- Update MODEL_SQL_PATTERN to allow for more granular matches; remove MODEL_LOAD_PATTERN
 
 ## [0.5.1] - 2020-11-19
 ### Changed

data/lib/ar_query_matchers/queries/create_counter.rb

@@ -23,7 +23,7 @@ module ArQueryMatchers
           # for inserts, name is always 'SQL', we have to rely on pattern matching the query string.
           select_from_table = sql.match(TABLE_NAME_SQL_PATTERN)
 
-          [TableName.new(select_from_table[:table_name])] if select_from_table
+          TableName.new(select_from_table[:table_name]) if select_from_table
         end
       end
     end

data/lib/ar_query_matchers/queries/load_counter.rb

@@ -15,15 +15,24 @@ 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 * FROM `users` ..."
+        # "SELECT COUNT(*) FROM `users` ..."
         MODEL_SQL_PATTERN = /SELECT (?:(?!SELECT).)* FROM [`"](?<table_name>[^`"]+)[`"]/.freeze
 
-        def filter_map(_name, sql)
-          # Pattern-matching on the table name in a SELECT ... FROM and looking
+        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
+
+          # Fall back to pattern-matching on the table name in a COUNT 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?
+          select_from_table = sql.match(MODEL_SQL_PATTERN)
+          TableName.new(select_from_table[:table_name]) if select_from_table
         end
       end
     end

data/lib/ar_query_matchers/queries/query_counter.rb

@@ -81,13 +81,9 @@ module ArQueryMatchers
           # Given a `sql.active_record` event, figure out which model is being
           # accessed. Some of the simpler queries have a :name key that makes this
           # really easy. Others require parsing the SQL by hand.
-          results = @query_filter.filter_map(payload[:name] || '', payload[:sql] || '')
-
-          # Round to microseconds
-          results&.each do |result|
-            model_name = result.model_name
-            next unless model_name
+          model_name = @query_filter.filter_map(payload[:name] || '', payload[:sql] || '')&.model_name
 
+          if model_name
             comment = payload[:sql].match(MARGINALIA_SQL_COMMENT_PATTERN)
             queries[model_name][:lines] << comment[:line] if comment
             queries[model_name][:count] += 1

data/lib/ar_query_matchers/queries/update_counter.rb

@@ -22,7 +22,7 @@ module ArQueryMatchers
         def filter_map(_name, sql)
           # for updates, name is always 'SQL', we have to rely on pattern matching on the query string instead.
           select_from_table = sql.match(TABLE_NAME_SQL_PATTERN)
-          [TableName.new(select_from_table[:table_name])] if select_from_table
+          TableName.new(select_from_table[:table_name]) if select_from_table
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar-query-matchers
 version: !ruby/object:Gem::Version
-  version: 0.5.2.pre.6
+  version: 0.5.2
 platform: ruby
 authors:
 - Matan Zruya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2021-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -186,9 +186,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3.1
 signing_key: