composite_primary_keys 13.0.0 → 13.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa8acb9d77d6a2de529283cbaa0cbea67daec08813942c8bfa83f39b0bdf299f
-  data.tar.gz: deb46f06053d8a07b19903a46b3d30e3ae82699d265f339c5463e810900416b6
+  metadata.gz: d9e6df76c33e6eae43b2be918772faba1bfaceaeb2849deedce615f94d6c84bd
+  data.tar.gz: cd28e3d91fea6190f64fe43a52eaea23fdd25ff601cfdf9fd4268cb361d98e1c
 SHA512:
-  metadata.gz: d31a495089eafc1cced865e0cd55e6e7a09698b124f30c7d18a754aa396c611f85abcfcf32af55e5c23534432d0f74c7eee5f1d674574c0a0b0c937d61fb16fd
-  data.tar.gz: ab7776729d53de9d12c08bb0035c256ef1d4cc00dab2b7be029a4c610c6cd36b6e1397160ebde56d7acaecc29817b1456e83b482a6a7f33c0a5ac15c6ba715e2
+  metadata.gz: '093c59b0bdbd0281194cd28bc70101b26c3402bb13ef7fa3fe1e60f865f2423dbe90f39a669a833173a19cc129c5457476d5233f6cdaf0a7a1859cb1d3b7e36c'
+  data.tar.gz: 9e08a5afafe648410b7a2eecf3190959300a27baf57e93da0988853862a851ef28e5a655032f3b1236b55d39c435f3b71721abad0740cdf136bdd0d7c66439b1

data/History.rdoc

@@ -1,3 +1,8 @@
+== 13.0.1
+* Fix invalid sql generation for some cases of scoped associations (Ryan Mulligan)
+* Fix unintentional connection to database (Kazuhiro Masuda)
+* Zip values then keys - fixes #548 (Charlie Savage)
+
 == 13.0.0
 * Update to ActiveRecord 6.1 (Javier Julio, Charlie Savage, Sammy Larbi)
 

data/lib/composite_primary_keys/associations/join_dependency.rb

@@ -1,6 +1,25 @@
 module ActiveRecord
   module Associations
     class JoinDependency
+
+      class JoinAssociation < JoinPart # :nodoc:
+        private
+          def append_constraints(join, constraints)
+            if join.is_a?(Arel::Nodes::StringJoin)
+              join_string = Arel::Nodes::And.new(constraints.unshift join.left)
+              join.left = Arel.sql(base_klass.connection.visitor.compile(join_string))
+            else
+              right = join.right
+              # CPK
+              if right.expr.children.empty?
+                right.expr = Arel::Nodes::And.new(constraints)
+              else
+                right.expr = Arel::Nodes::And.new(constraints.unshift right.expr)
+              end
+            end
+          end
+      end
+
       class Aliases # :nodoc:
         def column_alias(node, column)
           # CPK

data/lib/composite_primary_keys/composite_predicates.rb

@@ -32,7 +32,8 @@ module CompositePrimaryKeys
     end
 
     def cpk_id_predicate(table, keys, values)
-      eq_predicates = keys.zip(values).map do |key, value|
+      # We zip on values then keys in case values are not provided for each key field
+      eq_predicates = values.zip(keys).map do |value, key|
         table[key].eq(value)
       end
       cpk_and_predicate(eq_predicates)

data/lib/composite_primary_keys/relation.rb

@@ -29,7 +29,7 @@ module ActiveRecord
       stmt.key = table[primary_key]
 
       # CPK
-      if @klass.composite? && stmt.to_sql =~ /['"]#{primary_key.to_s}['"]/
+      if @klass.composite? && @klass.connection.visitor.compile(stmt.ast) =~ /['"]#{primary_key.to_s}['"]/
         stmt = Arel::UpdateManager.new
         stmt.table(arel_table)
         cpk_subquery(stmt)
@@ -74,7 +74,7 @@ module ActiveRecord
       stmt.key = table[primary_key]
 
       # CPK
-      if @klass.composite? && stmt.to_sql =~ /['"]#{primary_key.to_s}['"]/
+      if @klass.composite? && @klass.connection.visitor.compile(stmt.ast) =~ /['"]#{primary_key.to_s}['"]/
         stmt = Arel::DeleteManager.new
         stmt.from(arel_table)
         cpk_subquery(stmt)

data/lib/composite_primary_keys/version.rb

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

data/test/fixtures/membership.rb

@@ -1,7 +1,9 @@
-class Membership < ActiveRecord::Base
-  self.primary_keys = :user_id, :group_id
-  belongs_to :user
-	belongs_to :group
-	has_many :statuses, :class_name => 'MembershipStatus', :foreign_key => [:user_id, :group_id]
-  has_many :readings, :primary_key => :user_id, :foreign_key => :user_id
+class Membership < ActiveRecord::Base
+  self.primary_keys = :user_id, :group_id
+  belongs_to :user
+	belongs_to :group
+	has_many :statuses, :class_name => 'MembershipStatus', :foreign_key => [:user_id, :group_id]
+  has_many :active_statuses, -> { where('membership_statuses.status = ?', 'Active') },
+           :class_name => 'MembershipStatus', :foreign_key => [:user_id, :group_id]
+  has_many :readings, :primary_key => :user_id, :foreign_key => :user_id
 end

data/test/test_associations.rb

@@ -343,6 +343,14 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal([3,2], memberships[1].id)
   end
 
+  def test_scoped_has_many_with_primary_key_with_associations
+    memberships = Membership.joins(:active_statuses)
+    assert_equal(2, memberships.length)
+
+    assert_equal([1,1], memberships[0].id)
+    assert_equal([3,2], memberships[1].id)
+  end
+
   def test_foreign_key_present_with_null_association_ids
     group = Group.new
     group.memberships.build

data/test/test_delete.rb

@@ -31,6 +31,8 @@ class TestDelete < ActiveSupport::TestCase
   end
 
   def test_delete_all_with_join
+    tested_delete_all = false
+    Arel::Table.engine = nil # should not rely on the global Arel::Table.engine
     employee = employees(:mindy)
 
     assert_equal(5, Department.count)
@@ -41,6 +43,10 @@ class TestDelete < ActiveSupport::TestCase
 
     assert_equal(4, Department.count)
     assert_equal(1, deleted)
+    tested_delete_all = true
+  ensure
+    Arel::Table.engine = ActiveRecord::Base
+    assert tested_delete_all
   end
 
   def test_clear_association

data/test/test_update.rb

@@ -74,6 +74,8 @@ class TestUpdate < ActiveSupport::TestCase
   end
 
   def test_update_all_join
+    tested_update_all = false
+    Arel::Table.engine = nil # should not rely on the global Arel::Table.engine
     ReferenceCode.joins(:reference_type).
                   where('reference_types.reference_type_id = ?', 2).
                   update_all(:description => 'random value')
@@ -82,6 +84,10 @@ class TestUpdate < ActiveSupport::TestCase
                           where(:description => 'random value')
 
     assert_equal(2, query.count)
+    tested_update_all = true
+  ensure
+    Arel::Table.engine = ActiveRecord::Base
+    assert tested_update_all
   end
 
   def test_update_with_uniqueness

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 13.0.0
+  version: 13.0.1
 platform: ruby
 authors:
 - Charlie Savage
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-09 00:00:00.000000000 Z
+date: 2021-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Composite key support for ActiveRecord
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -201,7 +201,7 @@ homepage: https://github.com/composite-primary-keys/composite_primary_keys
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -216,16 +216,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.31
+signing_key:
 specification_version: 4
 summary: Composite key support for ActiveRecord
 test_files:
-- test/abstract_unit.rb
 - test/README_tests.rdoc
+- test/abstract_unit.rb
 - test/test_associations.rb
-- test/test_attributes.rb
 - test/test_attribute_methods.rb
+- test/test_attributes.rb
 - test/test_calculations.rb
 - test/test_callbacks.rb
 - test/test_composite_arrays.rb