Drop support for activerecord < 7.1

fatkodima · fatkodima · commit 0a5521f5b953 · 2025-06-13T01:57:51.000+03:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,16 +7,23 @@ jobs:
     strategy:
       matrix:
         include:
-          - gemfile: activerecord_70.gemfile
-          - gemfile: activerecord_72.gemfile
-          - gemfile: activerecord_head.gemfile
+          - ruby-version: "3.1"
+            gemfile: activerecord_71.gemfile
+          - ruby-version: "3.1"
+            gemfile: activerecord_72.gemfile
+          - ruby-version: "3.4"
+            gemfile: activerecord_80.gemfile
+
+          # Test against latest versions just in case.
+          - ruby-version: "3.4"
+            gemfile: activerecord_head.gemfile
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1
+          ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
       - name: Run the test suite
         run: bundle exec rake
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,4 +1,4 @@
-require:
+plugins:
   - rubocop-minitest
 
 AllCops:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## master (unreleased)
 
+- Drop support for activerecord < 7.1
+
 ## 0.1.0 (2024-07-10)
 
 - First release
diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,7 @@ gemspec
 
 gem "rake", "~> 13.0"
 gem "minitest"
-gem "sqlite3", "< 2"
+gem "sqlite3"
 gem "rubocop"
 gem "rubocop-minitest"
 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,19 +2,20 @@ PATH
   remote: .
   specs:
     active_record_tracer (0.1.0)
-      activerecord (>= 7.0)
+      activerecord (>= 7.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.2.0)
-      activesupport (= 7.2.0)
-    activerecord (7.2.0)
-      activemodel (= 7.2.0)
-      activesupport (= 7.2.0)
+    activemodel (8.0.2)
+      activesupport (= 8.0.2)
+    activerecord (8.0.2)
+      activemodel (= 8.0.2)
+      activesupport (= 8.0.2)
       timeout (>= 0.4.0)
-    activesupport (7.2.0)
+    activesupport (8.0.2)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
@@ -24,56 +25,62 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    ast (2.4.2)
-    base64 (0.2.0)
-    bigdecimal (3.1.8)
-    concurrent-ruby (1.3.3)
-    connection_pool (2.4.1)
-    drb (2.2.1)
-    i18n (1.14.5)
+      uri (>= 0.13.1)
+    ast (2.4.3)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
+    drb (2.2.3)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.7.2)
-    language_server-protocol (3.17.0.3)
-    logger (1.6.0)
-    mini_portile2 (2.8.7)
-    minitest (5.24.1)
-    parallel (1.26.1)
-    parser (3.3.4.2)
+    json (2.12.2)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    mini_portile2 (2.8.9)
+    minitest (5.25.5)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
+    prism (1.4.0)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.2.1)
-    regexp_parser (2.9.2)
-    rexml (3.3.4)
-      strscan
-    rubocop (1.65.1)
+    rake (13.3.0)
+    regexp_parser (2.10.0)
+    rubocop (1.76.1)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.45.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.0)
-      parser (>= 3.3.1.0)
-    rubocop-minitest (0.35.1)
-      rubocop (>= 1.61, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.45.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-minitest (0.38.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
     ruby-progressbar (1.13.0)
-    securerandom (0.3.1)
-    sqlite3 (1.7.3)
+    securerandom (0.4.1)
+    sqlite3 (2.7.0)
       mini_portile2 (~> 2.8.0)
-    sqlite3 (1.7.3-x86_64-darwin)
-    sqlite3 (1.7.3-x86_64-linux)
-    strscan (3.1.0)
-    timeout (0.4.1)
+    sqlite3 (2.7.0-x86_64-darwin)
+    sqlite3 (2.7.0-x86_64-linux-gnu)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.3)
 
 PLATFORMS
   ruby
@@ -87,7 +94,7 @@ DEPENDENCIES
   rake (~> 13.0)
   rubocop
   rubocop-minitest
-  sqlite3 (< 2)
+  sqlite3
 
 BUNDLED WITH
    2.5.11
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ which records are loaded the most, and the sources of those? This tool to the re
 ## Requirements
 
 - ruby 3.1+
-- activerecord 7.0+
+- activerecord 7.1+
 
 ## Installation
 
diff --git a/active_record_tracer.gemspec b/active_record_tracer.gemspec
@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
   spec.files = Dir["**/*.{md,txt}", "{lib}/**/*"]
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 7.0"
+  spec.add_dependency "activerecord", ">= 7.1"
 end
diff --git a/gemfiles/activerecord_71.gemfile b/gemfiles/activerecord_71.gemfile
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-@ar_gem_requirement = "~> 7.0.0"
+@ar_gem_requirement = "~> 7.1.0"
 
 eval_gemfile "../Gemfile"
diff --git a/gemfiles/activerecord_80.gemfile b/gemfiles/activerecord_80.gemfile
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+@ar_gem_requirement = "~> 8.0.0"
+
+eval_gemfile "../Gemfile"
diff --git a/lib/active_record_tracer/reporter.rb b/lib/active_record_tracer/reporter.rb
@@ -24,7 +24,7 @@ def initialize(top: 50, backtrace_lines: 5, ignore_cached_queries: false, ignore
       @backtraces_cache = {}
     end
 
-    def start
+    def start # rubocop:disable Naming/PredicateMethod
       @subscriber1 = ActiveSupport::Notifications.monotonic_subscribe("sql.active_record") do |_name, start, finish, _id, payload|
         next if payload[:cached] && @ignore_cached_queries
         next if payload[:name] == "SCHEMA" && @ignore_schema_queries

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-require:`
	`1`	`+plugins:`
`2`	`2`	`- rubocop-minitest`
`3`	`3`
`4`	`4`	`AllCops:`