ahoy_matey 5.2.0 → 5.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9161dead45561a928523eb7d5ed70be20c67c8629499c35cb428271d714895a7
-  data.tar.gz: f17eb958ee297a4eda86388e0458a04a2a39de5b868076521eb65dd6e4cbc21a
+  metadata.gz: 5ebbbd60be1beec66d70d5fee4922f013e61a9add9b9da33ec709fa8ca166cf7
+  data.tar.gz: '0969a3b0711ccc95e140017fc81480c2636a819b113b5a09337f72ff19b2fb09'
 SHA512:
-  metadata.gz: c68fa7030244573a75b72167d163a8a0f2cfb5ef01e3718980ea25e5c13a5936973d0d5f83d3302f9e610508d94758ec0587f6fe4dd19c7c23668181ea1dcfe0
-  data.tar.gz: 7950a3cd2dda3818e21a6da37ab0d1b49b01d22110c76f0ae1abd15abba7aaa6140db24d70cedb4d5af0c5022f2b95a2f7e5a11339425eefb51240bb9ea17578
+  metadata.gz: 6ef517cd3e3eb8b612ae54aef6b9051d1533acc0562303e03e8656b04b703425b55b0d4b6b0811c4f420c46ad6f34e6c01d2fc2dd802438f5dbbee36f82b4118
+  data.tar.gz: 228810c7e621654f88a21f864fd1400f0226fd9efb0d1902ffc98f997c9263daad675f656c59de2e28f5f641f2f70ed99e7814d071062610309a19f8724f4bc9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 5.2.1 (2024-10-07)
+
+- Fixed connection leasing for Active Record 7.2+
+
 ## 5.2.0 (2024-09-04)
 
 - Improved error handling for invalid API parameters

data/lib/ahoy/query_methods.rb

@@ -10,13 +10,13 @@ module Ahoy
       def where_props(properties)
         return all if properties.empty?
 
-        adapter_name = respond_to?(:connection) ? connection.adapter_name.downcase : "mongoid"
+        adapter_name = respond_to?(:connection_db_config) ? connection_db_config.adapter.to_s : "mongoid"
         case adapter_name
         when "mongoid"
           where(properties.to_h { |k, v| ["properties.#{k}", v] })
-        when /mysql|trilogy/
+        when /mysql|trilogy/i
           where("JSON_CONTAINS(properties, ?, '$') = 1", properties.to_json)
-        when /postgres|postgis/
+        when /postg/i
           case columns_hash["properties"].type
           when :hstore
             properties.inject(all) do |relation, (k, v)|
@@ -31,7 +31,7 @@ module Ahoy
           else
             where("properties::jsonb @> ?", properties.to_json)
           end
-        when /sqlite/
+        when /sqlite/i
           properties.inject(all) do |relation, (k, v)|
             if v.nil?
               relation.where("JSON_EXTRACT(properties, ?) IS NULL", "$.#{k}")
@@ -50,16 +50,16 @@ module Ahoy
         props.flatten!
 
         relation = all
-        adapter_name = respond_to?(:connection) ? connection.adapter_name.downcase : "mongoid"
+        adapter_name = respond_to?(:connection_db_config) ? connection_db_config.adapter.to_s : "mongoid"
         case adapter_name
         when "mongoid"
           raise "Adapter not supported: #{adapter_name}"
-        when /mysql|trilogy/
+        when /mysql|trilogy/i
           props.each do |prop|
-            quoted_prop = connection.quote("$.#{prop}")
+            quoted_prop = connection_pool.with_connection { |c| c.quote("$.#{prop}") }
             relation = relation.group("JSON_UNQUOTE(JSON_EXTRACT(properties, #{quoted_prop}))")
           end
-        when /postgres|postgis/
+        when /postg/i
           # convert to jsonb to fix
           # could not identify an equality operator for type json
           # and for text columns
@@ -67,12 +67,12 @@ module Ahoy
           cast = [:jsonb, :hstore].include?(column_type) ? "" : "::jsonb"
 
           props.each do |prop|
-            quoted_prop = connection.quote(prop)
+            quoted_prop = connection_pool.with_connection { |c| c.quote(prop) }
             relation = relation.group("properties#{cast} -> #{quoted_prop}")
           end
-        when /sqlite/
+        when /sqlite/i
           props.each do |prop|
-            quoted_prop = connection.quote("$.#{prop}")
+            quoted_prop = connection_pool.with_connection { |c| c.quote("$.#{prop}") }
             relation = relation.group("JSON_EXTRACT(properties, #{quoted_prop})")
           end
         else

data/lib/ahoy/version.rb

@@ -1,3 +1,3 @@
 module Ahoy
-  VERSION = "5.2.0"
+  VERSION = "5.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_matey
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-05 00:00:00.000000000 Z
+date: 2024-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Simple, powerful, first-party analytics for Rails