composite_primary_keys 13.0.5 → 13.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 397760c82733f99fafe1596036951df80ad7c440f6b6a8a4362e65459d2a5be9
-  data.tar.gz: 79b3579f453a63fa55f0474ca5f941d85e647714e9fdd892ca441eb500ad21e2
+  metadata.gz: d0759acf9a94a27e2baafbc5cf15b334f5364b4424120adfcd59a4ed9f783267
+  data.tar.gz: cae92844f0543e33b85b91620d06ab9032cda41c6e9e7ef27bfeec81d1e2027e
 SHA512:
-  metadata.gz: c4dfc8b13e54c9d4d7e761f545aacc262ad569681593175f29cf53040cfbd6ebf4a5d24b4e2698b0d6a90eb703650ce983f25410ca2cb8706d5776bcfa1c27a9
-  data.tar.gz: a7e17419407f1621c17c523594d80281dbbb1d16acde923678fd847d2d386c611f13d4b40a0e35c2532f22a8f63a7bdc888e5bfd3a258ece8f7e52c5a50bf61d
+  metadata.gz: 85d3dfab843abaf4371da5717d5b0962b281e81e9e3294fd2154571bec87d3e46b6852cc36be0de1c8aebec0f892a74c04e49296409d94d842bd18a0e7380534
+  data.tar.gz: 5d31a6dca9bd32215fcdf42c095eee41d6f6f56aef08c2ebda5dfef5d33686636f631542a029636da0dd7c6565bd48f8f99f606d137db532db9544aaee72b790

data/History.rdoc

@@ -1,3 +1,6 @@
+== 13.0.6 (2023-02-04)
+* Fix #577 (Charlie Savage)
+
 == 13.0.5 (2023-02-04)
 * Improve query generation for cpk_in_predicate. This reduces the length of
 queries when loading many keys and enables Postgres to use index scans

data/lib/composite_primary_keys/associations/preloader/association.rb

@@ -33,20 +33,28 @@ module ActiveRecord
           end
         end
 
-        def records_by_owner
-          @records_by_owner ||= preloaded_records.each_with_object({}) do |record, result|
-            key = if association_key_name.is_a?(Array)
-                    Array(record[association_key_name]).map do |key|
-                      convert_key(key)
-                    end
-                  else
-                    convert_key(record[association_key_name])
-                  end
-            owners_by_key[key].each do |owner|
-              (result[owner] ||= []) << record
+        def load_records
+          # owners can be duplicated when a relation has a collection association join
+          # #compare_by_identity makes such owners different hash keys
+          @records_by_owner = {}.compare_by_identity
+          raw_records = owner_keys.empty? ? [] : records_for(owner_keys)
+
+          @preloaded_records = raw_records.select do |record|
+            assignments = false
+
+            owners_by_key[convert_key(record[association_key_name])].each do |owner|
+              entries = (@records_by_owner[owner] ||= [])
+
+              if reflection.collection? || entries.empty?
+                entries << record
+                assignments = true
+              end
             end
+
+            assignments
           end
         end
+
       end
     end
   end

data/lib/composite_primary_keys/version.rb

@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION
     MAJOR = 13
     MINOR = 0
-    TINY  = 5
+    TINY  = 6
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/test/abstract_unit.rb

@@ -1,4 +1,4 @@
-spec_name = ENV['ADAPTER'] || 'sqlite'
+spec_name = ENV['ADAPTER'] || 'postgresql'
 require 'bundler'
 require 'minitest/autorun'
 

data/test/test_bug.rb

@@ -0,0 +1,45 @@
+require File.expand_path('../abstract_unit', __FILE__)
+
+require "bundler/inline"
+
+
+require "minitest/autorun"
+require "logger"
+
+# This connection will do for database-independent bug reports.
+ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
+ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+ActiveRecord::Schema.define do
+  create_table :parents, force: true do |t|
+  end
+
+  create_table :children, id: false, force: true do |t|
+    t.bigint :id
+    t.bigint :parent_id
+  end
+end
+
+class Parent < ActiveRecord::Base
+end
+
+class Child < ActiveRecord::Base
+  belongs_to :parent
+end
+
+class BugTest < Minitest::Test
+  def test_association_stuff
+    p1 = Parent.create!
+    p2 = Parent.create!
+    p3 = Parent.create!
+    Child.create!(id: 100, parent_id: p1.id)
+    Child.create!(id: 100, parent_id: p2.id)
+    Child.create!(id: 100, parent_id: p3.id)
+
+    children = Child.preload(:parent)
+    # if uncomment following line, this test pass
+    # children = Child.all
+    parents = children.map(&:parent)
+    assert_equal [p1.id, p2.id, p3.id], parents.map(&:id)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 13.0.5
+  version: 13.0.6
 platform: ruby
 authors:
 - Charlie Savage
@@ -171,6 +171,7 @@ files:
 - test/test_associations.rb
 - test/test_attribute_methods.rb
 - test/test_attributes.rb
+- test/test_bug.rb
 - test/test_calculations.rb
 - test/test_callbacks.rb
 - test/test_composite_arrays.rb
@@ -226,6 +227,7 @@ test_files:
 - test/test_associations.rb
 - test/test_attribute_methods.rb
 - test/test_attributes.rb
+- test/test_bug.rb
 - test/test_calculations.rb
 - test/test_callbacks.rb
 - test/test_composite_arrays.rb