Allow for more granular SQL statement matching for loads (#25)

* CI: Remove ruby 2.5.x and 2.6.x tests in favor of 2.7.x

* minor: Update publish script tag version -> ruby-version

* refactor: Update  MODEL_SQL_PATTERN to allow for more granular matches;
remove MODEL_LOAD_PATTERN

* rubocop: Fix or ignore

* chore: Remove dead code

* bump

* revert: Roll-back query matcher changes

* refactor: Ensure MODEL_SQL_PATTERN captures first-most table

Author: iking96

.github/workflows/push_gem.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Set up Ruby 2.6
       uses: actions/setup-ruby@v1
       with:
-        version: 2.6.x
+        ruby-version: 2.6.x
 
     - name: Publish to RubyGems
       run: |

.github/workflows/run_tests.yml

@@ -7,8 +7,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.5.x, 2.6.x]
-        appraisal: ["rails-4", "rails-5", "rails-6"]
+        ruby: [2.7.x]
+        appraisal: ["rails-5", "rails-6"]
     steps:
     - uses: actions/checkout@v1
     - name: Setup System

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-26
+### Changed
+- Update MODEL_SQL_PATTERN to allow for more accurate matches against SQL strings
+
 ## [0.5.1] - 2020-11-19
 ### Changed
 - Removes zero count expectations from hash before comparing

VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

lib/ar_query_matchers/queries/load_counter.rb

@@ -21,7 +21,7 @@ class LoadQueryFilter < Queries::QueryFilter
 
         # Matches unnamed SQL operations like the following:
         # "SELECT COUNT(*) FROM `users` ..."
-        MODEL_SQL_PATTERN = /SELECT .* FROM [`"](?<table_name>[^`"]+)[`"]/.freeze
+        MODEL_SQL_PATTERN = /SELECT (?:(?!SELECT).)* FROM [`"](?<table_name>[^`"]+)[`"]/.freeze
 
         def filter_map(name, sql)
           # First check for a `SELECT * FROM` query that ActiveRecord has

spec/ar_query_matchers/queries/load_counter_spec.rb

@@ -77,4 +77,15 @@
 
     expect(stats.query_counts).to eq('MockUser' => 1, 'MockPost' => 1)
   end
+
+  it 'returns the correct result when there are subqueries' do
+    user = MockUser.create!(name: 'Daniel')
+    MockPost.create!(mock_user: user)
+
+    stats = described_class.instrument do
+      MockPost.where(mock_user: MockUser.where(name: 'Daniel')).count
+    end
+
+    expect(stats.query_counts).to eq('MockPost' => 1)
+  end
 end