torque-postgresql 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ea2d3fe5e64c12ea8cf8b77ee39a08092b23c5f15802442d5bc92464e248111
-  data.tar.gz: 17541c4f9cbd22c940b5082be168c0fd62e9736abe77efc79340c73058342db4
+  metadata.gz: a8dfe147f5a65e1626923bff250d8c057c73e2fc2c2f2ea6812d67537da32e38
+  data.tar.gz: 3205fea618ea9da4d9aeccf3b5d48e3dff72a4a670e181c78c9b9a0b9896cfbf
 SHA512:
-  metadata.gz: 39f36019706145c9b6ff5c4e407ee95b7965746d194338a52d1ee3d67876008b62f673996fb41bc0eb257184454ba74cbe3ffc2cb60805bcaf2d366a3a8ad54f
-  data.tar.gz: 8c77b20d700a66a002eecf369d3d7e2f458d88b280e182e93c4e25bcd8ddbe10f03f77d578d50f13a7234683721ed3cc99d49eac9db7f3de1f0ade9c058f5e53
+  metadata.gz: ce88617dcacc292754245e9fff7f7dba62ec672a5b7b4760fff2ff2b28b4b25be7e8413b92bf509f5f9f9c4d0b096559b7ec46de4fdce5294181c363f34367fb
+  data.tar.gz: 6c3e8e96edd6b906bd2f0038869f9f15596fad7f22745c5bd63c08b623a55cf97f6185877206dac54a7e93e81ce5d7644bfeb048e7e2db1780bb7cadc7843159

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

@@ -11,20 +11,20 @@ module Torque
 
           def load_records_for_keys(keys, &block)
             condition = query_condition_for(keys)
+            return super if condition.nil?
+
             scope.where(condition).load(&block)
           end
 
           def query_condition_for(keys)
-            if connected_through_array?
-              value = scope.cast_for_condition(foreign_column, keys.to_a)
-              scope.table[association_key_name].overlaps(value)
-            else
-              { association_key_name => keys }
-            end
+            return unless connected_through_array?
+
+            value = scope.cast_for_condition(foreign_column, keys.to_a)
+            scope.table[association_key_name].overlaps(value)
           end
 
           def connected_through_array?
-            foreign_column.array?
+            !association_key_name.is_a?(Array) && foreign_column.array?
           end
         end
 

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

@@ -4,7 +4,7 @@ module Torque
   module PostgreSQL
     module SchemaReflection
       def add_model_name(connection, table_name, model)
-        cache(connection).add_model_name(table_name, model)
+        cache(connection).add_model_name(connection, table_name, model)
       end
 
       def dependencies(connection, table_name)

data/lib/torque/postgresql/schema_cache.rb

@@ -97,9 +97,11 @@ module Torque
       end
 
       # A way to manually add models name so it doesn't need the lookup method
-      def add_model_name(table_name, model)
-        return unless data_source_exists?(table_name) && model.is_a?(Class)
-        @data_sources_model_names[table_name] = model
+      def add_model_name(*args)
+        model, *source = args.reverse
+        return unless data_source_exists?(*source.reverse) && model.is_a?(Class)
+
+        @data_sources_model_names[source.first] = model
       end
 
       # Get all the tables that the given one inherits from

data/lib/torque/postgresql/version.rb

@@ -2,6 +2,6 @@
 
 module Torque
   module PostgreSQL
-    VERSION = '3.3.0'
+    VERSION = '3.3.1'
   end
 end

data/spec/tests/has_many_spec.rb

@@ -201,6 +201,47 @@ RSpec.describe 'HasMany' do
       expect(query.to_sql).to match(/INNER JOIN "texts"/)
       expect { query.load }.not_to raise_error
     end
+
+    context 'with query constraint' do
+      let(:activity) { Activity.create! }
+
+      before do
+        skip('Only Rails 7.1 onwards') unless Post.respond_to?(:query_constraints)
+
+        Post.query_constraints :author_id, :id
+        Activity.query_constraints :author_id, :id
+        Activity.has_many :posts
+      end
+
+      after do
+        Post.instance_variable_set(:@has_query_constraints, false)
+        Post.instance_variable_set(:@query_constraints_list, nil)
+        Post.instance_variable_set(:@_query_constraints_list, nil)
+        Activity.instance_variable_set(:@has_query_constraints, false)
+        Activity.instance_variable_set(:@query_constraints_list, nil)
+        Activity.instance_variable_set(:@_query_constraints_list, nil)
+      end
+
+      it 'properly preload records' do
+        FactoryBot.create_list(:post, 5, activity: activity)
+        entries = Activity.all.includes(:posts).load
+
+        expect(entries.size).to be_eql(1)
+        expect(entries.first.posts).to be_loaded
+        expect(entries.first.posts.size).to be_eql(5)
+      end
+
+      it 'properly preload records using preloader' do
+        FactoryBot.create_list(:post, 5, activity: activity)
+        entries = ActiveRecord::Associations::Preloader.new(
+          records: Activity.all,
+          associations: [:posts],
+        ).call.first.records_by_owner
+
+        expect(entries.size).to be_eql(1)
+        expect(entries.values.first.size).to be_eql(5)
+      end
+    end
   end
 
   context 'on array' do

data/spec/tests/table_inheritance_spec.rb

@@ -125,6 +125,7 @@ RSpec.describe 'TableInheritance' do
       subject.instance_variable_set(:@inheritance_loaded, true)
       subject.instance_variable_set(:@inheritance_dependencies, scenario)
       subject.instance_variable_set(:@inheritance_associations, subject.send(:generate_associations))
+      subject.instance_variable_set(:@data_sources_model_names, {})
       expect(subject.instance_variable_get(:@inheritance_associations)).to eql({
         'A' => %w(B D C N M),
         'B' => %w(C N M),
@@ -145,9 +146,9 @@ RSpec.describe 'TableInheritance' do
       end
 
       it 'respect irregular names' do
-        Torque::PostgreSQL.config.irregular_models = {
+        allow(Torque::PostgreSQL.config).to receive(:irregular_models).and_return({
           'public.posts' => 'ActivityPost',
-        }
+        })
 
         subject.send(:prepare_data_sources, *prepare_arguments)
         list = subject.instance_variable_get(:@data_sources_model_names)
@@ -156,15 +157,24 @@ RSpec.describe 'TableInheritance' do
       end
 
       it 'does not load irregular where the data source is not defined' do
-        Torque::PostgreSQL.config.irregular_models = {
+        allow(Torque::PostgreSQL.config).to receive(:irregular_models).and_return({
           'products' => 'Product',
-        }
+        })
 
         subject.send(:prepare_data_sources, *prepare_arguments)
         list = subject.instance_variable_get(:@data_sources_model_names)
         expect(list).to_not have_key('products')
       end
 
+      it 'works with eager loading' do
+        allow(Torque::PostgreSQL.config).to receive(:eager_load).and_return(true)
+        ActivityPost.reset_table_name
+
+        list = subject.instance_variable_get(:@data_sources_model_names)
+        expect(list).to have_key('activity_posts')
+        expect(list['activity_posts']).to eql(ActivityPost)
+      end
+
       {
         'activities' => 'Activity',
         'activity_posts' => 'ActivityPost',
@@ -237,7 +247,7 @@ RSpec.describe 'TableInheritance' do
       expect(other.table_name).to eql('authors')
     end
 
-    it 'respects the table name prefix and sufix defined on parent module' do
+    it 'respects the table name prefix and suffix defined on parent module' do
       mod = Object.const_set('Private', Module.new)
       mod.define_singleton_method(:table_name_prefix) { 'private.' }
       mod.define_singleton_method(:table_name_suffix) { '_bundle' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Carlos Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-18 00:00:00.000000000 Z
+date: 2024-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -289,6 +289,7 @@ licenses:
 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: 
 rdoc_options:
 - "--title"