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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c028b70b3fbf9ea3e703744480dfb98f6a1ef9b6ab2e90fc4c05879cb2eecff
-  data.tar.gz: c1191c7af4628af475e2e180ec3dd0233e80d69c0d5991d8278292fed6e1aec6
+  metadata.gz: 2aaeaac19a8660c885b5ac75c32077ab6b0f835c53aaefa1bb3d3b7bab701fd4
+  data.tar.gz: 3746c66186e7d067fc82895a8d7bb90dc230eb7ddef7553ad2bb9631bd69d097
 SHA512:
-  metadata.gz: f220e3dff11f0b978b6de20314646783814fadfc7cc15ad51d59236a76def60e98f77fe5495217f572046fffbd15a568b0f5827c56874a1b8dd71ec4c3822e04
-  data.tar.gz: 10ee5a3e0c6a39836d59649a0df91eb64f5967e8cc5df0d874755e33f1894d6f251f3f9e82bbc4395e97b67a1c820aaab929c3df05226e4d9c52e91fc133ddf7
+  metadata.gz: 7d43af021387d6a1ea871bf13d876a512e19cf98eb702f85f9ff0446970c8f6bfbf40356d1eb0c1417664fd8b47ab4e8aab115785f06f8f22f547ab284dfa809
+  data.tar.gz: f8785fb4accfb4f7a2573ced84211769793cc72bb6784de3884665f39a63346ebcc83046e737e6fca3e56a9fd1dbafc563805800b49df32ee77951137c76f8aa

data/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.2] - 2021-05-18
+### Changed
+- Removes 'SELECT' from MODEL_SQL_PATTERN to allow for more granular SQL statement matching
+
 ## [0.5.1] - 2020-11-19
 ### Changed
 - Removes zero count expectations from hash before comparing

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

@@ -21,18 +21,21 @@ module ArQueryMatchers
 
         # Matches unnamed SQL operations like the following:
         # "SELECT COUNT(*) FROM `users` ..."
-        MODEL_SQL_PATTERN = /SELECT .* FROM [`"](?<table_name>[^`"]+)[`"]/.freeze
+        MODEL_SQL_PATTERN = /FROM [`"](?<table_name>[^`"]+)[`"]/.freeze
 
-        def filter_map(name, sql)
+        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
+          #
+          # 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
           # up the table name from ActiveRecord's loaded descendants.
-          select_from_table = sql.match(MODEL_SQL_PATTERN)
-          TableName.new(select_from_table[:table_name]) if select_from_table
+          selects_from_table = sql.scan(MODEL_SQL_PATTERN)
+          selects_from_table.map { |(table_name)| TableName.new(table_name) } unless selects_from_table.empty?
         end
       end
     end

data/lib/ar_query_matchers/queries/query_counter.rb

@@ -81,9 +81,13 @@ 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.
-          model_name = @query_filter.filter_map(payload[:name] || '', payload[:sql] || '')&.model_name
+          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
 
-          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.1
+  version: 0.5.2.pre.5
 platform: ruby
 authors:
 - Matan Zruya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -186,11 +186,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Ruby test matchers for instrumenting ActiveRecord query counts