From cb504c96f5d536faa55e909cb2cd1e7317e2daec Mon Sep 17 00:00:00 2001
From: Brian Reigersberg <brian@hackerone.com>
Date: Fri, 20 Dec 2024 15:44:09 +0100
Subject: [PATCH] upgrade pg query to 5.1.0

---
 Gemfile.lock         | 38 ++++++++++++++++++++++++--------------
 arel_toolkit.gemspec |  5 +++--
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 408689b6..5493a23a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,27 +1,32 @@
 PATH
   remote: .
   specs:
-    arel_toolkit (0.6.0)
-      activerecord (>= 7.0, < 8)
+    arel_toolkit (0.5.0)
+      activerecord (>= 6.1, < 7)
       pg (>= 1.1.4)
-      pg_query (~> 2.2)
+      pg_query (~> 5.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activerecord (7.0.4.3)
-      activemodel (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activesupport (7.0.4.3)
+    activemodel (6.1.7.3)
+      activesupport (= 6.1.7.3)
+    activerecord (6.1.7.3)
+      activemodel (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
+    activesupport (6.1.7.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     ansi (1.5.0)
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
     approvals (0.0.26)
       json (~> 2.0)
       nokogiri (~> 1.8)
@@ -46,6 +51,7 @@ GEM
       async
     async-pool (0.3.12)
       async (>= 1.25)
+    bigdecimal (3.1.8)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     coderay (1.1.3)
@@ -75,7 +81,9 @@ GEM
       octokit (~> 4.6)
       rainbow (>= 2.2.1)
       rake (>= 10.0)
-    google-protobuf (3.21.12)
+    google-protobuf (4.29.2)
+      bigdecimal
+      rake (>= 13)
     guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -112,7 +120,7 @@ GEM
     multi_json (1.15.0)
     nenv (0.3.0)
     nio4r (2.5.8)
-    nokogiri (1.14.3)
+    nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     notiffany (0.1.3)
@@ -125,8 +133,8 @@ GEM
     parser (3.2.1.1)
       ast (~> 2.4.1)
     pg (1.4.6)
-    pg_query (2.2.1)
-      google-protobuf (>= 3.19.2)
+    pg_query (5.1.0)
+      google-protobuf (>= 3.22.3)
     protocol-hpack (1.4.2)
     protocol-http (0.23.12)
     protocol-http1 (0.14.6)
@@ -217,11 +225,13 @@ GEM
     webrick (1.7.0)
     yard (0.9.28)
       webrick (~> 1.7.0)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  appraisal (~> 2.4.1)
   approvals (~> 0.0.24)
   arel_toolkit!
   bundler (~> 2.0)
@@ -249,4 +259,4 @@ DEPENDENCIES
   stackprof (~> 0.2)
 
 BUNDLED WITH
-   2.4.11
+   2.4.10
diff --git a/arel_toolkit.gemspec b/arel_toolkit.gemspec
index 9e813772..1a4471ec 100644
--- a/arel_toolkit.gemspec
+++ b/arel_toolkit.gemspec
@@ -26,9 +26,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.extensions    = ['ext/pg_result_init/extconf.rb']
 
-  spec.add_dependency 'activerecord', '>= 7.0', '< 8'
+  spec.add_dependency 'activerecord', '>= 6.1', '< 7'
   spec.add_dependency 'pg', '>= 1.1.4'
-  spec.add_dependency 'pg_query', '~> 2.2'
+  spec.add_dependency 'pg_query', '~> 5.1'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'dpl', '~> 1.10.11'
@@ -37,6 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake-compiler', '~> 1.0'
   spec.add_development_dependency 'rspec', '~> 3.8'
   spec.add_development_dependency 'approvals', '~> 0.0.24'
+  spec.add_development_dependency 'appraisal', '~> 2.4.1'
   spec.add_development_dependency 'database_cleaner', '~> 1.7.0'
   spec.add_development_dependency 'simplecov', '~> 0.16.1'
   spec.add_development_dependency 'simplecov-console', '~> 0.4.2'