diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7891e00..8b9e926 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,6 +16,9 @@ jobs:
           - '7.1'
           - '7.2'
           - '8.0'
+        exclude:
+          - ruby: '3.1'
+            rails: '8.0'
     services:
       postgres:
         image: postgres:13
diff --git a/gemfiles/5.2.gemfile b/gemfiles/5.2.gemfile
deleted file mode 100644
index 7d57591..0000000
--- a/gemfiles/5.2.gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.2"
-
-gemspec path: "../"
diff --git a/gemfiles/5.2.gemfile.lock b/gemfiles/5.2.gemfile.lock
deleted file mode 100644
index 1e43107..0000000
--- a/gemfiles/5.2.gemfile.lock
+++ /dev/null
@@ -1,79 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    active_record_distinct_on (1.4.0)
-      activerecord (>= 5.2, < 7.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (5.2.6)
-      activesupport (= 5.2.6)
-    activerecord (5.2.6)
-      activemodel (= 5.2.6)
-      activesupport (= 5.2.6)
-      arel (>= 9.0)
-    activesupport (5.2.6)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    appraisal (2.4.1)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (9.0.0)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
-    docile (1.4.0)
-    i18n (1.8.11)
-      concurrent-ruby (~> 1.0)
-    method_source (1.0.0)
-    minitest (5.14.4)
-    pry (0.14.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    rake (13.0.6)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    simplecov (0.21.2)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
-    sqlite3 (1.4.2)
-    thor (1.1.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-  x86_64-linux
-
-DEPENDENCIES
-  active_record_distinct_on!
-  activerecord (~> 5.2)
-  appraisal
-  bundler
-  pry
-  rake (>= 12.3.3)
-  rspec
-  simplecov
-  sqlite3
-
-BUNDLED WITH
-   2.2.31
diff --git a/gemfiles/6.0.gemfile b/gemfiles/6.0.gemfile
deleted file mode 100644
index 5b48be1..0000000
--- a/gemfiles/6.0.gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 6.0"
-
-gemspec path: "../"
diff --git a/gemfiles/6.0.gemfile.lock b/gemfiles/6.0.gemfile.lock
deleted file mode 100644
index 7defade..0000000
--- a/gemfiles/6.0.gemfile.lock
+++ /dev/null
@@ -1,78 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    active_record_distinct_on (1.4.0)
-      activerecord (>= 5.2, < 7.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activerecord (6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activesupport (6.1.4.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    appraisal (2.4.1)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
-    docile (1.4.0)
-    i18n (1.8.11)
-      concurrent-ruby (~> 1.0)
-    method_source (1.0.0)
-    minitest (5.14.4)
-    pry (0.14.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    rake (13.0.6)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    simplecov (0.21.2)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
-    sqlite3 (1.4.2)
-    thor (1.1.0)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    zeitwerk (2.5.1)
-
-PLATFORMS
-  ruby
-  x86_64-linux
-
-DEPENDENCIES
-  active_record_distinct_on!
-  activerecord (~> 6.0)
-  appraisal
-  bundler
-  pry
-  rake (>= 12.3.3)
-  rspec
-  simplecov
-  sqlite3
-
-BUNDLED WITH
-   2.2.31
diff --git a/gemfiles/6.1.gemfile.lock b/gemfiles/6.1.gemfile.lock
index 8029012..0a4f236 100644
--- a/gemfiles/6.1.gemfile.lock
+++ b/gemfiles/6.1.gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    active_record_distinct_on (1.6.0)
-      activerecord (>= 6.1, < 7.2)
+    active_record_distinct_on (1.7.0)
+      activerecord (>= 6.1)
 
 GEM
   remote: https://rubygems.org/
@@ -29,6 +29,7 @@ GEM
     i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
+    mini_portile2 (2.8.8)
     minitest (5.14.4)
     pg (1.5.4)
     pry (0.14.1)
@@ -54,7 +55,8 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.3)
-    sqlite3 (1.4.2)
+    sqlite3 (1.7.3)
+      mini_portile2 (~> 2.8.0)
     thor (1.1.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
@@ -74,7 +76,7 @@ DEPENDENCIES
   rake (>= 12.3.3)
   rspec
   simplecov
-  sqlite3
+  sqlite3 (~> 1.4)
 
 BUNDLED WITH
    2.4.5
diff --git a/gemfiles/7-1.gemfile b/gemfiles/7-1.gemfile
deleted file mode 100644
index eca365d..0000000
--- a/gemfiles/7-1.gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 7.1"
-
-gemspec path: "../"
diff --git a/gemfiles/7.0.gemfile.lock b/gemfiles/7.0.gemfile.lock
index 255a65f..24a771a 100644
--- a/gemfiles/7.0.gemfile.lock
+++ b/gemfiles/7.0.gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    active_record_distinct_on (1.6.0)
-      activerecord (>= 6.1, < 7.2)
+    active_record_distinct_on (1.7.0)
+      activerecord (>= 6.1)
 
 GEM
   remote: https://rubygems.org/
@@ -28,6 +28,7 @@ GEM
     i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
+    mini_portile2 (2.8.8)
     minitest (5.15.0)
     pg (1.5.4)
     pry (0.14.1)
@@ -53,7 +54,8 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.3)
-    sqlite3 (1.4.2)
+    sqlite3 (1.7.3)
+      mini_portile2 (~> 2.8.0)
     thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
@@ -72,7 +74,7 @@ DEPENDENCIES
   rake (>= 12.3.3)
   rspec
   simplecov
-  sqlite3
+  sqlite3 (~> 1.4)
 
 BUNDLED WITH
    2.4.5
diff --git a/gemfiles/7.1.gemfile.lock b/gemfiles/7.1.gemfile.lock
index 803f424..9f5d709 100644
--- a/gemfiles/7.1.gemfile.lock
+++ b/gemfiles/7.1.gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    active_record_distinct_on (1.6.0)
-      activerecord (>= 6.1, < 7.2)
+    active_record_distinct_on (1.7.0)
+      activerecord (>= 6.1)
 
 GEM
   remote: https://rubygems.org/
@@ -39,6 +39,7 @@ GEM
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
+    mini_portile2 (2.8.8)
     minitest (5.20.0)
     mutex_m (0.1.2)
     pg (1.5.4)
@@ -66,14 +67,15 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    sqlite3 (1.6.6-x86_64-linux)
+    sqlite3 (1.7.3)
+      mini_portile2 (~> 2.8.0)
     thor (1.2.2)
     timeout (0.4.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
 
 PLATFORMS
-  x86_64-linux
+  ruby
 
 DEPENDENCIES
   active_record_distinct_on!
@@ -85,7 +87,7 @@ DEPENDENCIES
   rake (>= 12.3.3)
   rspec
   simplecov
-  sqlite3
+  sqlite3 (~> 1.4)
 
 BUNDLED WITH
    2.4.5
diff --git a/gemfiles/7.2.gemfile.lock b/gemfiles/7.2.gemfile.lock
index eab3dba..c27db77 100644
--- a/gemfiles/7.2.gemfile.lock
+++ b/gemfiles/7.2.gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    active_record_distinct_on (1.6.0)
-      activerecord (>= 6.1, < 7.3)
+    active_record_distinct_on (1.7.0)
+      activerecord (>= 6.1)
 
 GEM
   remote: https://rubygems.org/
@@ -40,6 +40,7 @@ GEM
       concurrent-ruby (~> 1.0)
     logger (1.6.0)
     method_source (1.1.0)
+    mini_portile2 (2.8.8)
     minitest (5.24.1)
     pg (1.5.7)
     pry (0.14.2)
@@ -66,32 +67,15 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    sqlite3 (2.0.3-aarch64-linux-gnu)
-    sqlite3 (2.0.3-aarch64-linux-musl)
-    sqlite3 (2.0.3-arm-linux-gnu)
-    sqlite3 (2.0.3-arm-linux-musl)
-    sqlite3 (2.0.3-arm64-darwin)
-    sqlite3 (2.0.3-x86-linux-gnu)
-    sqlite3 (2.0.3-x86-linux-musl)
-    sqlite3 (2.0.3-x86_64-darwin)
-    sqlite3 (2.0.3-x86_64-linux-gnu)
-    sqlite3 (2.0.3-x86_64-linux-musl)
+    sqlite3 (1.7.3)
+      mini_portile2 (~> 2.8.0)
     thor (1.3.1)
     timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
 
 PLATFORMS
-  aarch64-linux-gnu
-  aarch64-linux-musl
-  arm-linux-gnu
-  arm-linux-musl
-  arm64-darwin
-  x86-linux-gnu
-  x86-linux-musl
-  x86_64-darwin
-  x86_64-linux-gnu
-  x86_64-linux-musl
+  ruby
 
 DEPENDENCIES
   active_record_distinct_on!
@@ -103,7 +87,7 @@ DEPENDENCIES
   rake (>= 12.3.3)
   rspec
   simplecov
-  sqlite3
+  sqlite3 (~> 1.4)
 
 BUNDLED WITH
    2.5.14