relation_to_struct 1.10.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 549ee5cb86cc57e6e4cb814297bedc09d3b3098ddb6c12d463bde197cebf5807
-  data.tar.gz: 210c9b4e734e438cd67fa4dce3c6385751439f014c159d1e4d1520065b7bb673
+  metadata.gz: 1424d19f9ffa5b1ae51ec9fc827910e8ac97551d990d0d3d1050a056da2896f8
+  data.tar.gz: 47c097cae34a96dc068bf57f8f04c6094d2cf58c7c2f089e70bcbe8e4d8ac03f
 SHA512:
-  metadata.gz: e7068c377384815b4bd582e66453f03b4f67145424ddba922311fb5b0596cb19976455f85e4685af2b360f6481ea5323c6fad8482a100ad312bd6db655c41aad
-  data.tar.gz: 0d031d351e2162a06674a7d8e09e45a7d3c2ad0a0d376827fa9c4809c927e12efe52c3f1fef3ff16d28fef97d397eb95937d213241e54392abcce92c13087099
+  metadata.gz: 14f4a17a7b1961c8257ce9b7bdcc86f2365b58655411a3dfa550c4b3e206cf777fc43d35a21207ed0cf6cea5d3343e6b9a6583817fa2d871ea0fe278b55a565d
+  data.tar.gz: 6ec72d1363066eda7fbea68cc7e41ae51f5c3318b719464c8e62763485a7a5984c17f5ff38f85bf500a946a458a048b9812af25f9077fa7b4ccc675da59e428c

data/.github/workflows/ci.yml

@@ -13,17 +13,17 @@ jobs:
         ruby:
           - "3.2"
           - "3.3"
+          - "3.4"
         gemfile:
-          - rails_7_0
-          - rails_7_1
           - rails_7_2
           - rails_8_0
+          - rails_8_1
     name: PostgreSQL ${{ matrix.pg }} - Ruby ${{ matrix.ruby }} - ${{ matrix.gemfile }}
     runs-on: ubuntu-latest
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: Start the postgres container
         run: docker compose up -d
         env:
@@ -42,17 +42,17 @@ jobs:
         ruby:
           - "3.2"
           - "3.3"
+          - "3.4"
         gemfile:
-          - rails_7_0
-          - rails_7_1
           - rails_7_2
           - rails_8_0
+          - rails_8_1
     name: SQLite - Ruby ${{ matrix.ruby }} - ${{ matrix.gemfile }}
     runs-on: ubuntu-latest
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: Setup Ruby using .ruby-version file
         uses: ruby/setup-ruby@v1
         with:

data/Appraisals

@@ -1,6 +1,5 @@
-%w(7.0 7.1 7.2 8.0).each do |version|
+%w(7.2 8.0 8.1).each do |version|
   appraise "rails-#{version.gsub(/\./, "-")}" do
     gem "rails", "~> #{version}.0"
-    gem "sqlite3", "~> 1.4" if version == "7.0"
   end
 end

data/bin/setup

@@ -9,4 +9,4 @@ bundle exec appraisal install
 # Do any other automated setup that you need to do here
 
 # Launch a blank postgres image
-docker-compose up -d
+docker compose up -d

data/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "3.3"
 services:
   db:
     image: postgres:${PGVERSION:-16}

data/gemfiles/{rails_7_1.gemfile → rails_8_1.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 7.1.0"
+gem "rails", "~> 8.1.0"
 
 gemspec path: "../"

data/lib/relation_to_struct/active_record_connection_adapter_extension.rb

@@ -1,7 +1,7 @@
 module RelationToStruct::ActiveRecordConnectionAdapterExtension
   def structs_from_sql(struct_class, sql, binds=[])
     sanitized_sql = ActiveRecord::Base.sanitize_sql(sql)
-    result = ActiveRecord::Base.uncached do
+    result = uncached do
       select_all(sanitized_sql, "Structs SQL Load", binds)
     end
 
@@ -26,7 +26,7 @@ module RelationToStruct::ActiveRecordConnectionAdapterExtension
 
   def pluck_from_sql(sql, binds=[])
     sanitized_sql = ActiveRecord::Base.sanitize_sql(sql)
-    result = ActiveRecord::Base.uncached do
+    result = uncached do
       select_all(sanitized_sql, "Pluck SQL Load", binds)
     end
     result.cast_values()
@@ -34,7 +34,7 @@ module RelationToStruct::ActiveRecordConnectionAdapterExtension
 
   def value_from_sql(sql, binds=[])
     sanitized_sql = ActiveRecord::Base.sanitize_sql(sql)
-    result = ActiveRecord::Base.uncached do
+    result = uncached do
       select_all(sanitized_sql, "Value SQL Load", binds)
     end
     raise ArgumentError, 'Expected exactly one column to be selected' unless result.columns.size == 1
@@ -52,7 +52,7 @@ module RelationToStruct::ActiveRecordConnectionAdapterExtension
 
   def tuple_from_sql(sql, binds=[])
     sanitized_sql = ActiveRecord::Base.sanitize_sql(sql)
-    result = ActiveRecord::Base.uncached do
+    result = uncached do
       select_all(sanitized_sql, "Value SQL Load", binds)
     end
     values = result.cast_values()

data/lib/relation_to_struct/version.rb

@@ -1,3 +1,3 @@
 module RelationToStruct
-  VERSION = "1.10.0"
+  VERSION = "1.11.1"
 end

data/relation_to_struct.gemspec

@@ -21,11 +21,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "appraisal", ">= 2.5"
   spec.add_development_dependency "bundler", ">= 1.7"
   spec.add_development_dependency "rake", ">= 10.0"
-  spec.add_development_dependency "sqlite3", ">= 1.4"
+  spec.add_development_dependency "sqlite3", ">= 2.1"
   spec.add_development_dependency "rspec", ">= 3.2"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "pg"
 
-  spec.add_dependency "activerecord", ">= 7.0", "< 8.1"
-  spec.add_dependency "activesupport", ">= 7.0", "< 8.1"
+  spec.add_dependency "activerecord", ">= 7.2", "< 8.2"
+  spec.add_dependency "activesupport", ">= 7.2", "< 8.2"
 end

data/spec/active_record_base_spec.rb

@@ -6,6 +6,69 @@ describe ActiveRecord::Base do
     EconomicSchool.delete_all
   end
 
+  # A secondary connection pool simulates a sharded connection — one that belongs
+  # to a different pool than ActiveRecord::Base. The old implementation used
+  # ActiveRecord::Base.uncached, which only disables the cache on ActiveRecord::Base's
+  # pool and has no effect on secondary pools.
+  describe "with a subclass using a secondary connection pool" do
+    let(:secondary_class) do
+      klass = Class.new(ActiveRecord::Base) { self.abstract_class = true }
+      stub_const("SecondaryTestConnection", klass)
+      klass.establish_connection(ActiveRecord::Base.connection_db_config)
+      klass
+    end
+    after(:each) { secondary_class.remove_connection if secondary_class.connected? }
+
+    it 'pluck_from_sql bypasses the cache on a subclass using a different pool than ActiveRecord::Base' do
+      sql = "SELECT random()"
+      value_1 = value_2 = nil
+
+      secondary_class.cache do
+        value_1 = secondary_class.pluck_from_sql(sql)
+        value_2 = secondary_class.pluck_from_sql(sql)
+      end
+
+      expect(value_1).not_to eq(value_2)
+    end
+
+    it 'value_from_sql bypasses the cache on a subclass using a different pool than ActiveRecord::Base' do
+      sql = "SELECT random()"
+      value_1 = value_2 = nil
+
+      secondary_class.cache do
+        value_1 = secondary_class.value_from_sql(sql)
+        value_2 = secondary_class.value_from_sql(sql)
+      end
+
+      expect(value_1).not_to eq(value_2)
+    end
+
+    it 'tuple_from_sql bypasses the cache on a subclass using a different pool than ActiveRecord::Base' do
+      sql = "SELECT random()"
+      value_1 = value_2 = nil
+
+      secondary_class.cache do
+        value_1 = secondary_class.tuple_from_sql(sql)
+        value_2 = secondary_class.tuple_from_sql(sql)
+      end
+
+      expect(value_1).not_to eq(value_2)
+    end
+
+    it 'structs_from_sql bypasses the cache on a subclass using a different pool than ActiveRecord::Base' do
+      test_struct = Struct.new(:r)
+      sql = "SELECT random() AS r"
+      value_1 = value_2 = nil
+
+      secondary_class.cache do
+        value_1 = secondary_class.structs_from_sql(test_struct, sql)
+        value_2 = secondary_class.structs_from_sql(test_struct, sql)
+      end
+
+      expect(value_1).not_to eq(value_2)
+    end
+  end
+
   describe "#pluck_from_sql" do
     it 'allows plucking with SQL directly' do
       sql = "SELECT 1 * 23"

data/spec/active_record_connection_adapter_spec.rb

@@ -8,6 +8,70 @@ describe ActiveRecord::ConnectionAdapters::AbstractAdapter do
 
   let(:connection) { ActiveRecord::Base.connection }
 
+  # A secondary connection pool simulates a sharded connection — one that belongs
+  # to a different pool than ActiveRecord::Base. The old implementation used
+  # ActiveRecord::Base.uncached, which only disables the cache on ActiveRecord::Base's
+  # pool and has no effect on secondary pools.
+  describe "with a secondary connection pool" do
+    let(:secondary_class) do
+      klass = Class.new(ActiveRecord::Base) { self.abstract_class = true }
+      stub_const("SecondaryTestConnection", klass)
+      klass.establish_connection(ActiveRecord::Base.connection_db_config)
+      klass
+    end
+    let(:secondary_connection) { secondary_class.connection }
+    after(:each) { secondary_class.remove_connection if secondary_class.connected? }
+
+    it 'pluck_from_sql bypasses the cache on a connection belonging to a different pool than ActiveRecord::Base' do
+      sql = "SELECT random()"
+      value_1 = value_2 = nil
+
+      secondary_class.cache do
+        value_1 = secondary_connection.pluck_from_sql(sql)
+        value_2 = secondary_connection.pluck_from_sql(sql)
+      end
+
+      expect(value_1).not_to eq(value_2)
+    end
+
+    it 'value_from_sql bypasses the cache on a connection belonging to a different pool than ActiveRecord::Base' do
+      sql = "SELECT random()"
+      value_1 = value_2 = nil
+
+      secondary_class.cache do
+        value_1 = secondary_connection.value_from_sql(sql)
+        value_2 = secondary_connection.value_from_sql(sql)
+      end
+
+      expect(value_1).not_to eq(value_2)
+    end
+
+    it 'tuple_from_sql bypasses the cache on a connection belonging to a different pool than ActiveRecord::Base' do
+      sql = "SELECT random()"
+      value_1 = value_2 = nil
+
+      secondary_class.cache do
+        value_1 = secondary_connection.tuple_from_sql(sql)
+        value_2 = secondary_connection.tuple_from_sql(sql)
+      end
+
+      expect(value_1).not_to eq(value_2)
+    end
+
+    it 'structs_from_sql bypasses the cache on a connection belonging to a different pool than ActiveRecord::Base' do
+      test_struct = Struct.new(:r)
+      sql = "SELECT random() AS r"
+      value_1 = value_2 = nil
+
+      secondary_class.cache do
+        value_1 = secondary_connection.structs_from_sql(test_struct, sql)
+        value_2 = secondary_connection.structs_from_sql(test_struct, sql)
+      end
+
+      expect(value_1).not_to eq(value_2)
+    end
+  end
+
   describe "#pluck_from_sql" do
     it 'allows plucking with SQL directly' do
       sql = "SELECT 1 * 23"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relation_to_struct
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.1
 platform: ruby
 authors:
 - James Coleman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-26 00:00:00.000000000 Z
+date: 2026-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,40 +114,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
 description: ''
 email:
 - jtc331@gmail.com
@@ -168,10 +168,9 @@ files:
 - Rakefile
 - bin/setup
 - docker-compose.yml
-- gemfiles/rails_7_0.gemfile
-- gemfiles/rails_7_1.gemfile
 - gemfiles/rails_7_2.gemfile
 - gemfiles/rails_8_0.gemfile
+- gemfiles/rails_8_1.gemfile
 - lib/relation_to_struct.rb
 - lib/relation_to_struct/active_record_base_extension.rb
 - lib/relation_to_struct/active_record_connection_adapter_extension.rb

data/gemfiles/rails_7_0.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 7.0.0"
-gem "sqlite3", "~> 1.4"
-
-gemspec path: "../"