torque-postgresql 3.3.0 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ea2d3fe5e64c12ea8cf8b77ee39a08092b23c5f15802442d5bc92464e248111
-  data.tar.gz: 17541c4f9cbd22c940b5082be168c0fd62e9736abe77efc79340c73058342db4
+  metadata.gz: 3a40ad54958c3355dabba2edfdf5fb0a833e9f2eeb16eb6aa680e522a93fe5cd
+  data.tar.gz: 32b7d2b052b475996081fedcfd265ed45f75aa115941269e93d26f6b88fe97e0
 SHA512:
-  metadata.gz: 39f36019706145c9b6ff5c4e407ee95b7965746d194338a52d1ee3d67876008b62f673996fb41bc0eb257184454ba74cbe3ffc2cb60805bcaf2d366a3a8ad54f
-  data.tar.gz: 8c77b20d700a66a002eecf369d3d7e2f458d88b280e182e93c4e25bcd8ddbe10f03f77d578d50f13a7234683721ed3cc99d49eac9db7f3de1f0ade9c058f5e53
+  metadata.gz: f36f81c4fd169d0e2dd164f17ba28ee6b6efb7e656609b45471216c5ec7119dc1f567e9864616420786a985d1a1630da681b423c7f9bff035fcf347c518dce14
+  data.tar.gz: de52240614a54984891c727edb19811ab67037a30f5f284bf4e5f9ce7e29e0afd19e9cc24897fdd2a1d060f6fc3d3ac466a39a812c3f975ec4c91b7bf51b0ec2

data/lib/torque/postgresql/associations/belongs_to_many_association.rb

@@ -12,9 +12,9 @@ module Torque
         ## CUSTOM
         def ids_reader
           if loaded?
-            target.pluck(reflection.association_primary_key)
+            target.pluck(reflection.active_record_primary_key)
           elsif !target.empty?
-            load_target.pluck(reflection.association_primary_key)
+            load_target.pluck(reflection.active_record_primary_key)
           else
             stale_state || column_default_value
           end

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.2'
   end
 end

data/spec/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-version = 2
+version = 3
 
 return if ActiveRecord::Migrator.current_version == version
 ActiveRecord::Schema.define(version: version) do
@@ -77,14 +77,14 @@ ActiveRecord::Schema.define(version: version) do
   create_table "texts", force: :cascade do |t|
     t.integer  "user_id"
     t.string   "content"
-    t.enum     "conflict",  enum_type: :conflicts
+    t.enum     "conflict", enum_type: :conflicts
   end
 
   create_table "comments", force: :cascade do |t|
-    t.integer "user_id",    null: false
+    t.integer "user_id", null: false
     t.integer "comment_id"
     t.integer "video_id"
-    t.text    "content",    null: false
+    t.text    "content", null: false
     t.string  "kind"
     t.index ["user_id"], name: "index_comments_on_user_id", using: :btree
     t.index ["comment_id"], name: "index_comments_on_comment_id", using: :btree
@@ -92,7 +92,7 @@ ActiveRecord::Schema.define(version: version) do
 
   create_table "courses", force: :cascade do |t|
     t.integer  "category_id"
-    t.string   "title",      null: false
+    t.string   "title", null: false
     t.interval "duration"
     t.enum     "types", enum_type: :types, array: true
     t.datetime "created_at", null: false
@@ -108,7 +108,7 @@ ActiveRecord::Schema.define(version: version) do
     t.integer  "activity_id"
     t.string   "title"
     t.text     "content"
-    t.enum     "status",    enum_type: :content_status
+    t.enum     "status", enum_type: :content_status
     t.index ["author_id"], name: "index_posts_on_author_id", using: :btree
   end
 
@@ -120,8 +120,8 @@ ActiveRecord::Schema.define(version: version) do
   end
 
   create_table "users", force: :cascade do |t|
-    t.string   "name",       null: false
-    t.enum     "role",                    enum_type: :roles, default: :visitor
+    t.string   "name", null: false
+    t.enum     "role", enum_type: :roles, default: :visitor
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
@@ -137,7 +137,7 @@ ActiveRecord::Schema.define(version: version) do
     t.integer  "author_id"
     t.string   "title"
     t.boolean  "active"
-    t.enum     "kind",                    enum_type: :types
+    t.enum     "kind", enum_type: :types
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end

data/spec/tests/belongs_to_many_spec.rb

@@ -400,7 +400,7 @@ RSpec.describe 'BelongsToMany' do
     let(:player) { Class.new(ActiveRecord::Base) }
     let(:other) { player.create }
 
-    # TODO: Set as a shred example
+    # TODO: Set as a shared example
     before do
       connection.create_table(:players, id: :uuid) { |t| t.string :name }
       connection.create_table(:games, id: :uuid) { |t| t.uuid :player_ids, array: true }
@@ -440,4 +440,45 @@ RSpec.describe 'BelongsToMany' do
       expect { query.load }.not_to raise_error
     end
   end
+
+  context 'using custom keys' do
+    let(:connection) { ActiveRecord::Base.connection }
+    let(:post) { Post }
+    let(:tag) { Tag }
+    let(:tags) { %w[a b c].map { |id| create(:tag, friendly_id: id) } }
+
+    subject { create(:post) }
+
+    before do
+      connection.add_column(:tags, :friendly_id, :string)
+      connection.add_column(:posts, :friendly_tag_ids, :string, array: true)
+      post.belongs_to_many(:tags, foreign_key: :friendly_tag_ids, primary_key: :friendly_id)
+      post.reset_column_information
+      tag.reset_column_information
+    end
+
+    after do
+      tag.reset_column_information
+      post.reset_column_information
+      post._reflections.delete(:tags)
+    end
+
+    it 'loads associated records' do
+      subject.update(friendly_tag_ids: tags.pluck(:friendly_id))
+
+      expect(subject.tags.to_sql).to be_eql(<<-SQL.squish)
+        SELECT "tags".* FROM "tags" WHERE "tags"."friendly_id" IN ('a', 'b', 'c')
+      SQL
+
+      expect(subject.tags.load).to be_a(ActiveRecord::Associations::CollectionProxy)
+      expect(subject.tags.to_a).to be_eql(tags)
+    end
+
+    it 'can properly assign tags' do
+      expect(subject.friendly_tag_ids).to be_blank
+
+      subject.tags = tags
+      expect(subject.friendly_tag_ids).to be_eql(%w[a b c])
+    end
+  end
 end

data/spec/tests/distinct_on_spec.rb

@@ -40,7 +40,7 @@ RSpec.describe 'DistinctOn' do
     end
 
     it 'raises with invalid relation' do
-      expect { subject.distinct_on(tags: :name).to_sql }.to \
+      expect { subject.distinct_on(supervisors: :name).to_sql }.to \
         raise_error(ArgumentError, /Relation for/)
     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/relation_spec.rb

@@ -44,7 +44,7 @@ RSpec.describe 'Relation', type: :helper do
     end
 
     it 'raises on relation not present' do
-      check = [tags: :name]
+      check = [supervisors: :name]
       expect{ subject.call(check) }.to raise_error(ArgumentError, /Relation for/)
     end
 

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.2
 platform: ruby
 authors:
 - Carlos Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-18 00:00:00.000000000 Z
+date: 2024-03-13 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"