torque-postgresql 3.3.2 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a40ad54958c3355dabba2edfdf5fb0a833e9f2eeb16eb6aa680e522a93fe5cd
-  data.tar.gz: 32b7d2b052b475996081fedcfd265ed45f75aa115941269e93d26f6b88fe97e0
+  metadata.gz: 84962b5a78fc9b09f10f35c091e90ec83e71786a8e6b98d2e88468376b7fc20e
+  data.tar.gz: 4637773971675c9381075895134efc16e0589ec7b4a4219e92bd7b6e6a34eb5d
 SHA512:
-  metadata.gz: f36f81c4fd169d0e2dd164f17ba28ee6b6efb7e656609b45471216c5ec7119dc1f567e9864616420786a985d1a1630da681b423c7f9bff035fcf347c518dce14
-  data.tar.gz: de52240614a54984891c727edb19811ab67037a30f5f284bf4e5f9ce7e29e0afd19e9cc24897fdd2a1d060f6fc3d3ac466a39a812c3f975ec4c91b7bf51b0ec2
+  metadata.gz: f36770306242b9bfce00fa8216080be72970ec2b69f3f1b3e98dbf30151f1017699a0d3f9c731154b60ecddba17cd382e56e116edaf701aa2549dc25a9ab000f
+  data.tar.gz: 9ecbd264e042f773a9e93bf414a233932ec4ed5663125894f2e3011d0a6f1c829f41fdbdee3f30ed891df2bfe9adce174dd7bfd29eb2bbe615c31a4bf124a787

data/lib/torque/postgresql/associations/preloader/loader_query.rb

@@ -24,7 +24,7 @@ module Torque
           end
 
           def connected_through_array?
-            !association_key_name.is_a?(Array) && foreign_column.array?
+            !association_key_name.is_a?(Array) && foreign_column&.array?
           end
         end
 

data/lib/torque/postgresql/base.rb

@@ -201,9 +201,11 @@ module Torque
         end
 
         # Allow extra keyword arguments to be sent to +InsertAll+
-        def upsert_all(attributes, **xargs)
-          xargs = xargs.merge(on_duplicate: :update)
-          ::ActiveRecord::InsertAll.new(self, attributes, **xargs).execute
+        unless Torque::PostgreSQL::AR720
+          def upsert_all(attributes, **xargs)
+            xargs = xargs.reverse_merge(on_duplicate: :update)
+            ::ActiveRecord::InsertAll.new(self, attributes, **xargs).execute
+          end
         end
 
         protected

data/lib/torque/postgresql/config.rb

@@ -6,6 +6,7 @@ module Torque
 
     # Stores a version check for compatibility purposes
     AR710 = (ActiveRecord.gem_version >= Gem::Version.new('7.1.0'))
+    AR720 = (ActiveRecord.gem_version >= Gem::Version.new('7.2.0'))
 
     # Use the same logger as the Active Record one
     def self.logger

data/lib/torque/postgresql/reflection/belongs_to_many_reflection.rb

@@ -25,7 +25,7 @@ module Torque
         end
 
         def foreign_key
-          @foreign_key ||= options[:foreign_key] || derive_foreign_key.freeze
+          @foreign_key ||= options[:foreign_key]&.to_s || derive_foreign_key.freeze
         end
 
         def association_foreign_key
@@ -33,7 +33,7 @@ module Torque
         end
 
         def active_record_primary_key
-          @active_record_primary_key ||= options[:primary_key] || derive_primary_key
+          @active_record_primary_key ||= options[:primary_key]&.to_s || derive_primary_key
         end
 
         def join_primary_key(*)

data/lib/torque/postgresql/relation.rb

@@ -102,7 +102,7 @@ module Torque
         # Compatibility method with 5.0
         unless ActiveRecord::Relation.method_defined?(:set_value)
           def set_value(name, value)
-            assert_mutability!
+            assert_mutability! if respond_to?(:assert_mutability!)
             @values[name] = value
           end
         end
@@ -133,6 +133,14 @@ module Torque
           klass.superclass.send(:relation) if klass.define_attribute_methods &&
             klass.superclass != ActiveRecord::Base && !klass.superclass.abstract_class?
         end
+
+        # Allow extra keyword arguments to be sent to +InsertAll+
+        if Torque::PostgreSQL::AR720
+          def upsert_all(attributes, **xargs)
+            xargs = xargs.reverse_merge(on_duplicate: :update)
+            ::ActiveRecord::InsertAll.execute(self, attributes, **xargs)
+          end
+        end
       end
     end
 

data/lib/torque/postgresql/schema_cache/bound_schema_reflection.rb

@@ -4,19 +4,23 @@ module Torque
   module PostgreSQL
     module BoundSchemaReflection
       def add_model_name(table_name, model)
-        @schema_reflection.add_model_name(@connection, table_name, model)
+        source = defined?(@pool) ? @pool : @connection
+        @schema_reflection.add_model_name(source, table_name, model)
       end
 
       def dependencies(table_name)
-        @schema_reflection.dependencies(@connection, table_name)
+        source = defined?(@pool) ? @pool : @connection
+        @schema_reflection.dependencies(source, table_name)
       end
 
       def associations(table_name)
-        @schema_reflection.associations(@connection, table_name)
+        source = defined?(@pool) ? @pool : @connection
+        @schema_reflection.associations(source, table_name)
       end
 
       def lookup_model(table_name, scoped_class = '')
-        @schema_reflection.lookup_model(@connection, table_name, scoped_class)
+        source = defined?(@pool) ? @pool : @connection
+        @schema_reflection.lookup_model(source, table_name, scoped_class)
       end
     end
 

data/lib/torque/postgresql/schema_cache/schema_reflection.rb

@@ -3,20 +3,20 @@
 module Torque
   module PostgreSQL
     module SchemaReflection
-      def add_model_name(connection, table_name, model)
-        cache(connection).add_model_name(connection, table_name, model)
+      def add_model_name(source, table_name, model)
+        cache(source).add_model_name(source, table_name, model)
       end
 
-      def dependencies(connection, table_name)
-        cache(connection).dependencies(connection, table_name)
+      def dependencies(source, table_name)
+        cache(source).dependencies(source, table_name)
       end
 
-      def associations(connection, table_name)
-        cache(connection).associations(connection, table_name)
+      def associations(source, table_name)
+        cache(source).associations(source, table_name)
       end
 
-      def lookup_model(connection, table_name, scoped_class)
-        cache(connection).lookup_model(table_name, scoped_class)
+      def lookup_model(source, table_name, scoped_class)
+        cache(source).lookup_model(table_name, scoped_class)
       end
     end
 

data/lib/torque/postgresql/schema_cache.rb

@@ -105,15 +105,15 @@ module Torque
       end
 
       # Get all the tables that the given one inherits from
-      def dependencies(conn, table_name = conn)
-        reload_inheritance_data!(conn == table_name ? connection : conn)
+      def dependencies(source, table_name = source)
+        reload_inheritance_data!(source == table_name ? connection : source)
         @inheritance_dependencies[table_name]
       end
 
       # Get the list of all tables that are associated (direct or indirect
       # inheritance) with the provided one
-      def associations(conn, table_name = conn)
-        reload_inheritance_data!(conn == table_name ? connection : conn)
+      def associations(source, table_name = source)
+        reload_inheritance_data!(source == table_name ? connection : source)
         @inheritance_associations[table_name]
       end
 
@@ -127,11 +127,15 @@ module Torque
 
         # Reload information about tables inheritance and dependencies, uses a
         # cache to not perform additional checks
-        def reload_inheritance_data!(connection)
+        def reload_inheritance_data!(source)
           return if @inheritance_loaded
-          @inheritance_dependencies = connection.inherited_tables
-          @inheritance_associations = generate_associations
-          @inheritance_loaded = true
+
+          method_name = Torque::PostgreSQL::AR720 ? :with_connection : :then
+          source.public_send(method_name) do |connection|
+            @inheritance_dependencies = connection.inherited_tables
+            @inheritance_associations = generate_associations
+            @inheritance_loaded = true
+          end
         end
 
         # Calculates the inverted dependency (association), where even indirect
@@ -141,11 +145,12 @@ module Torque
         end
 
         # Use this method to also load any irregular model name
-        def prepare_data_sources(connection = nil)
-          Torque::PostgreSQL::AR710 ? super : super()
+        method_name = Torque::PostgreSQL::AR720 ? :add_all : :prepare_data_sources
+        define_method(method_name) do |source = nil|
+          Torque::PostgreSQL::AR710 ? super(source) : super()
 
-          sources = connection.present? ? tables_to_cache(connection) : @data_sources.keys
-          @data_sources_model_names = prepare_irregular_models(sources)
+          data_sources = source.present? ? tables_to_cache(source) : @data_sources.keys
+          @data_sources_model_names = prepare_irregular_models(data_sources)
         end
 
     end

data/lib/torque/postgresql/version.rb

@@ -2,6 +2,6 @@
 
 module Torque
   module PostgreSQL
-    VERSION = '3.3.2'
+    VERSION = '3.4.0'
   end
 end

data/spec/mocks/cache_query.rb

@@ -1,16 +1,33 @@
 module Mocks
   module CacheQuery
-    def get_last_executed_query(&block)
-      conn = ActiveRecord::Base.connection
-      conn.instance_variable_set(:@query_cache_enabled, true)
+    if Torque::PostgreSQL::AR720
+      def get_last_executed_query(&block)
+        cache = ActiveRecord::Base.connection.query_cache
+        cache.instance_variable_set(:@enabled, true)
 
-      block.call
-      result = conn.query_cache.keys.first
+        map = cache.instance_variable_get(:@map)
 
-      conn.instance_variable_set(:@query_cache_enabled, false)
-      conn.instance_variable_get(:@query_cache).delete(result)
+        block.call
+        result = map.keys.first
 
-      result
+        cache.instance_variable_set(:@enabled, false)
+        map.delete(result)
+
+        result
+      end
+    else
+      def get_last_executed_query(&block)
+        conn = ActiveRecord::Base.connection
+        conn.instance_variable_set(:@query_cache_enabled, true)
+
+        block.call
+        result = conn.query_cache.keys.first
+
+        conn.instance_variable_set(:@query_cache_enabled, false)
+        conn.instance_variable_get(:@query_cache).delete(result)
+
+        result
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -40,7 +40,7 @@ RSpec.configure do |config|
   # Handles acton before rspec initialize
   config.before(:suite) do
     Torque::PostgreSQL.config.schemas.whitelist << 'internal'
-    ActiveSupport::Deprecation.silenced = true
+    ActiveSupport::Deprecation.try(:silenced=, true)
     DatabaseCleaner.clean_with(:truncation)
   end
 

data/spec/tests/auxiliary_statement_spec.rb

@@ -672,7 +672,7 @@ RSpec.describe 'AuxiliaryStatement' do
       result << ' SELECT COUNT(*) FROM "users"'
       result << ' INNER JOIN "comments" ON "comments"."user_id" = "users"."id"'
 
-      query = get_last_executed_query{ subject.with(:comments).count }
+      query = get_last_executed_query { subject.with(:comments).count }
       expect(query).to eql(result)
     end
 
@@ -687,7 +687,7 @@ RSpec.describe 'AuxiliaryStatement' do
       result << ' SELECT SUM("comments"."value") FROM "users"'
       result << ' INNER JOIN "comments" ON "comments"."user_id" = "users"."id"'
 
-      query = get_last_executed_query{ subject.with(:comments).sum(comments: :value) }
+      query = get_last_executed_query { subject.with(:comments).sum(comments: :value) }
       expect(query).to eql(result)
     end
 

data/spec/tests/belongs_to_many_spec.rb

@@ -5,6 +5,8 @@ RSpec.describe 'BelongsToMany' do
     let(:model) { Video }
     let(:builder) { Torque::PostgreSQL::Associations::Builder::BelongsToMany }
     let(:reflection) { Torque::PostgreSQL::Reflection::BelongsToManyReflection }
+    let(:key) { Torque::PostgreSQL::AR720 ? :tests : 'tests' }
+
     after { model._reflections = {} }
 
     it 'has the builder method' do
@@ -20,11 +22,20 @@ RSpec.describe 'BelongsToMany' do
 
       model.belongs_to_many(:tests)
     end
+
+    it 'allows setting up foreign key and primary_key as symbol' do
+      model.belongs_to_many(:tests, foreign_key: :test_ids, primary_key: :test_id)
+
+      reflection = model._reflections[key]
+      expect(reflection.foreign_key).to be_eql('test_ids')
+      expect(reflection.active_record_primary_key).to be_eql('test_id')
+    end
   end
 
   context 'on association' do
     let(:other) { Tag }
     let(:initial) { FactoryBot.create(:tag) }
+    let(:key) { Torque::PostgreSQL::AR720 ? :tags : 'tags' }
 
     before { Video.belongs_to_many(:tags) }
     subject { Video.create(title: 'A') }
@@ -36,11 +47,11 @@ RSpec.describe 'BelongsToMany' do
 
     it 'has the method' do
       expect(subject).to respond_to(:tags)
-      expect(subject._reflections).to include('tags')
+      expect(subject._reflections).to include(key)
     end
 
     it 'has correct foreign key' do
-      item = subject._reflections['tags']
+      item = subject._reflections[key]
       expect(item.foreign_key).to be_eql('tag_ids')
     end
 
@@ -359,7 +370,7 @@ RSpec.describe 'BelongsToMany' do
       expect { query.load }.not_to raise_error
     end
 
-    context 'When the attribute has a default value' do
+    context 'when the attribute has a default value' do
       subject { FactoryBot.create(:item) }
 
       it 'will always return the column default value' do
@@ -382,7 +393,7 @@ RSpec.describe 'BelongsToMany' do
       end
     end
 
-    context 'When record is not persisted' do
+    context 'when record is not persisted' do
       let(:initial) { FactoryBot.create(:tag) }
 
       subject { Video.new(title: 'A', tags: [initial]) }

data/spec/tests/enum_set_spec.rb

@@ -43,8 +43,16 @@ RSpec.describe 'Enum' do
   end
 
   context 'on schema' do
+    let(:source) do
+      if Torque::PostgreSQL::AR720
+        ActiveRecord::Base.connection_pool
+      else
+        ActiveRecord::Base.connection
+      end
+    end
+
     let(:dump_result) do
-      ActiveRecord::SchemaDumper.dump(connection, (dump_result = StringIO.new))
+      ActiveRecord::SchemaDumper.dump(source, (dump_result = StringIO.new))
       dump_result.string
     end
 

data/spec/tests/has_many_spec.rb

@@ -11,6 +11,7 @@ RSpec.describe 'HasMany' do
 
   context 'on original' do
     let(:other) { Text }
+    let(:key) { Torque::PostgreSQL::AR720 ? :texts : 'texts' }
 
     before { User.has_many :texts }
     subject { User.create(name: 'User 1') }
@@ -18,11 +19,11 @@ RSpec.describe 'HasMany' do
 
     it 'has the method' do
       expect(subject).to respond_to(:texts)
-      expect(subject._reflections).to include('texts')
+      expect(subject._reflections).to include(key)
     end
 
     it 'has correct foreign key' do
-      item = subject._reflections['texts']
+      item = subject._reflections[key]
       expect(item.foreign_key).to be_eql('user_id')
     end
 
@@ -246,6 +247,7 @@ RSpec.describe 'HasMany' do
 
   context 'on array' do
     let(:other) { Video }
+    let(:key) { Torque::PostgreSQL::AR720 ? :videos : 'videos' }
 
     before { Tag.has_many :videos, array: true }
     subject { Tag.create(name: 'A') }
@@ -253,11 +255,11 @@ RSpec.describe 'HasMany' do
 
     it 'has the method' do
       expect(subject).to respond_to(:videos)
-      expect(subject._reflections).to include('videos')
+      expect(subject._reflections).to include(key)
     end
 
     it 'has correct foreign key' do
-      item = subject._reflections['videos']
+      item = subject._reflections[key]
       expect(item.foreign_key).to be_eql('tag_ids')
     end
 

data/spec/tests/interval_spec.rb

@@ -1,8 +1,15 @@
 require 'spec_helper'
 
 RSpec.describe 'Interval' do
-  let(:connection) { ActiveRecord::Base.connection }
   let(:table_definition) { ActiveRecord::ConnectionAdapters::PostgreSQL::TableDefinition }
+  let(:connection) { ActiveRecord::Base.connection }
+  let(:source) do
+    if Torque::PostgreSQL::AR720
+      ActiveRecord::Base.connection_pool
+    else
+      ActiveRecord::Base.connection
+    end
+  end
 
   context 'on settings' do
     it 'must be set to ISO 8601' do
@@ -27,7 +34,7 @@ RSpec.describe 'Interval' do
   context 'on schema' do
     it 'can be used on tables too' do
       dump_io = StringIO.new
-      ActiveRecord::SchemaDumper.dump(connection, dump_io)
+      ActiveRecord::SchemaDumper.dump(source, dump_io)
       expect(dump_io.string).to match /t\.interval +"duration"/
     end
   end

data/spec/tests/schema_spec.rb

@@ -2,6 +2,13 @@ require 'spec_helper'
 
 RSpec.describe 'Schema' do
   let(:connection) { ActiveRecord::Base.connection }
+  let(:source) do
+    if Torque::PostgreSQL::AR720
+      ActiveRecord::Base.connection_pool
+    else
+      ActiveRecord::Base.connection
+    end
+  end
 
   before do
     connection.instance_variable_set(:@schemas_blacklist, nil)
@@ -64,7 +71,7 @@ RSpec.describe 'Schema' do
 
   context 'on schema' do
     let(:dump_result) do
-      ActiveRecord::SchemaDumper.dump(connection, (dump_result = StringIO.new))
+      ActiveRecord::SchemaDumper.dump(source, (dump_result = StringIO.new))
       dump_result.string
     end
 

data/spec/tests/table_inheritance_spec.rb

@@ -73,8 +73,16 @@ RSpec.describe 'TableInheritance' do
   end
 
   context 'on schema' do
+    let(:source) do
+      if Torque::PostgreSQL::AR720
+        ActiveRecord::Base.connection_pool
+      else
+        ActiveRecord::Base.connection
+      end
+    end
+
     let(:dump_result) do
-      ActiveRecord::SchemaDumper.dump(connection, (dump_result = StringIO.new))
+      ActiveRecord::SchemaDumper.dump(source, (dump_result = StringIO.new))
       dump_result.string
     end
 
@@ -105,9 +113,12 @@ RSpec.describe 'TableInheritance' do
 
   context 'on schema cache' do
     let(:schema_cache) { ActiveRecord::Base.connection.schema_cache }
-    let(:schema_cache_connection) { schema_cache.instance_variable_get(:@connection) }
     let(:schema_cache_reflection) { schema_cache.instance_variable_get(:@schema_reflection) }
-    let(:new_schema_cache) { schema_cache_reflection.send(:cache, schema_cache_connection) }
+    let(:new_schema_cache) { schema_cache_reflection.send(:cache, schema_cache_source) }
+
+    let(:schema_cache_source) do
+      schema_cache.instance_variable_get(Torque::PostgreSQL::AR720 ? :@pool : :@connection)
+    end
 
     subject { Torque::PostgreSQL::AR710 ? new_schema_cache : schema_cache }
 
@@ -137,7 +148,8 @@ RSpec.describe 'TableInheritance' do
     end
 
     context 'on looking up models' do
-      let(:prepare_arguments) { Torque::PostgreSQL::AR710 ? [schema_cache_connection] : nil }
+      let(:prepare_arguments) { Torque::PostgreSQL::AR710 ? [schema_cache_source] : nil }
+      let(:prepare_method) { Torque::PostgreSQL::AR720 ? :add_all : :prepare_data_sources }
 
       after(:all) do
         schema_cache = ActiveRecord::Base.connection.schema_cache
@@ -150,7 +162,7 @@ RSpec.describe 'TableInheritance' do
           'public.posts' => 'ActivityPost',
         })
 
-        subject.send(:prepare_data_sources, *prepare_arguments)
+        subject.send(prepare_method, *prepare_arguments)
         list = subject.instance_variable_get(:@data_sources_model_names)
         expect(list).to have_key('public.posts')
         expect(list['public.posts']).to eql(ActivityPost)
@@ -161,7 +173,7 @@ RSpec.describe 'TableInheritance' do
           'products' => 'Product',
         })
 
-        subject.send(:prepare_data_sources, *prepare_arguments)
+        subject.send(prepare_method, *prepare_arguments)
         list = subject.instance_variable_get(:@data_sources_model_names)
         expect(list).to_not have_key('products')
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.4.0
 platform: ruby
 authors:
 - Carlos Silva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-13 00:00:00.000000000 Z
+date: 2024-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -290,7 +290,7 @@ metadata:
   source_code_uri: https://github.com/crashtech/torque-postgresql
   bug_tracker_uri: https://github.com/crashtech/torque-postgresql/issues
   changelog_uri: https://github.com/crashtech/torque-postgresql/releases
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - Torque PostgreSQL
@@ -307,8 +307,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.2.15
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: ActiveRecord extension to access PostgreSQL advanced resources
 test_files: