composite_primary_keys 9.0.0 → 9.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 407e2b2f6781c2f4dbc7e34e576942f3833dbb98
-  data.tar.gz: 189eb2e8ac24f2124288a15189fbab23d119bba5
+  metadata.gz: f4248480dc399e7b5855cdcb24c52aa0d316cb84
+  data.tar.gz: 8cf2391613840634669fbfac2d0df07fcc4b89d0
 SHA512:
-  metadata.gz: 024d036a68642775e0763f05962303e5f4b4ccb5b60942820daa9e46fb82f16eb6f7bcd0bfe61bdcb383ebcfac2e3d74805c2e75184fdc488e8a20cef8cadab1
-  data.tar.gz: 5ce0de500d3c796b374716dcbe4a356930a3537490f6e6e26eecd59bce02bf0626abfc1e19c6b536736d06d689121881ed08cb47aa0a5e8eaf802f8d6ab18c26
+  metadata.gz: 55a92a161646aedc85be40fc0832651050962e5c53e941f3d97f0a89ace2fbc9363b1bec30f7115dca9d91409b95389fd1dcabe29cbfbd2768113c60e116d0c4
+  data.tar.gz: cd1df5d88752ae0ea029e4b24239cc1038f8a012951c5859a5c3a23dd8183648b6880cebffcd148424a7789e53509af39ecb9e760b3eaa959f127dd35748392f

data/History.rdoc

@@ -1,9 +1,17 @@
+== 9.0.1 (2016-07-27)
+* Create OR predicates in a nicely balanced tree fixing #320 (Nathan Samson)
+
 == 9.0.0 (2016-07-06)
 * Support connection_specification_name in rails5.0.0.rc1 (pocari)
 
 == 9.0.0.beta1 (2016-04-16)
 * Rails 5 beta support (Sammy Larbi)
 
+== 8.1.4 (2016-07-27)
+
+* Create OR predicates in a nicely balanced tree fixing #320 (Nathan Samson)
+* Fix find in batches (apurvis)
+
 == 8.1.3 (2016-04-16)
 
 * Make CPK work for Arel::Attributes::Attribute (Rick Xing)

data/lib/composite_primary_keys/associations/has_many_association.rb

@@ -1,7 +1,23 @@
 module ActiveRecord
   module Associations
     class HasManyAssociation
-      silence_warnings do
+      include CompositePrimaryKeys::Predicates
+
+      def delete_records(records, method)
+        if method == :destroy
+          records.each(&:destroy!)
+          update_counter(-records.length) unless reflection.inverse_updates_counter_cache?
+          return
+        # Zerista
+        elsif self.reflection.klass.composite?
+          predicate = cpk_in_predicate(self.scope.table, self.reflection.klass.primary_keys, records.map(&:id))
+          scope = self.scope.where(predicate)
+        else
+          scope = self.scope.where(reflection.klass.primary_key => records)
+        end
+        update_counter(-delete_count(method, scope))
+      end
+
         def delete_count(method, scope)
           if method == :delete_all
             scope.delete_all
@@ -27,5 +43,4 @@ module ActiveRecord
         end
       end
     end
-  end
 end

data/lib/composite_primary_keys/composite_predicates.rb

@@ -8,13 +8,23 @@ module CompositePrimaryKeys
       end
     end
 
-    def cpk_or_predicate(predicates)
-      or_predicate = predicates.map do |predicate|
-        ::Arel::Nodes::Grouping.new(predicate)
-      end.inject do |memo, node|
-        ::Arel::Nodes::Or.new(memo, node)
+    def cpk_or_predicate(predicates, group = true)
+      if predicates.length <= 1
+        predicates.first
+      else
+        split_point = predicates.length / 2
+        predicates_first_half = predicates[0...split_point]
+        predicates_second_half = predicates[split_point..-1]
+
+        or_predicate = ::Arel::Nodes::Or.new(cpk_or_predicate(predicates_first_half, false),
+                                             cpk_or_predicate(predicates_second_half, false))
+
+        if group
+          ::Arel::Nodes::Grouping.new(or_predicate)
+        else
+          or_predicate
+        end
       end
-      ::Arel::Nodes::Grouping.new(or_predicate)
     end
 
     def cpk_id_predicate(table, keys, values)

data/lib/composite_primary_keys/version.rb

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

data/test/fixtures/employee.rb

@@ -2,10 +2,9 @@ class Employee < ActiveRecord::Base
 	belongs_to :department, :foreign_key => [:department_id, :location_id]
 	has_many :comments, :as => :person
 	has_and_belongs_to_many :groups
-        has_many :salaries,
-          :primary_key => [:id, :location_id],
-          :foreign_key => [:employee_id, :location_id]
-        has_one :one_salary, :class_name => "Salary",
-          :primary_key => [:id, :location_id],
-          :foreign_key => [:employee_id, :location_id]
+	has_many :salaries, :primary_key => [:id, :location_id],
+		                  :foreign_key => [:employee_id, :location_id]
+	has_one :one_salary, :class_name => "Salary",
+		                   :primary_key => [:id, :location_id],
+		                   :foreign_key => [:employee_id, :location_id]
 end

data/test/fixtures/tariff.rb

@@ -1,5 +1,5 @@
-class Tariff < ActiveRecord::Base
-	self.primary_keys = [:tariff_id, :start_date]
-	has_many :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
-	has_many :products, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
-end
+class Tariff < ActiveRecord::Base
+	self.primary_keys = [:tariff_id, :start_date]
+	has_many :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date], :dependent => :delete_all
+	has_many :products, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
+end

data/test/test_associations.rb

@@ -257,7 +257,7 @@ class TestAssociations < ActiveSupport::TestCase
     assert_not_nil(department.head)
   end
 
-  def test_has_many_build__simple_key
+  def test_has_many_build_simple_key
     user = users(:santiago)
     reading = user.readings.build
     assert_equal user.id, reading.user_id

data/test/test_delete.rb

@@ -19,36 +19,36 @@ class TestDelete < ActiveSupport::TestCase
     self.class.classes = CLASSES
   end
 
-  def test_destroy_one
-    testing_with do
-      assert @first.destroy
-    end
-  end
-
-  def test_destroy_one_alone_via_class
-    testing_with do
-      assert @klass.destroy(@first.id)
-    end
-  end
-
-  def test_delete_one_alone
-    testing_with do
-      assert @klass.delete(@first.id)
-    end
-  end
-
-  def test_delete_many
-    testing_with do
-      to_delete = @klass.limit(2)
-      assert_equal 2, to_delete.length
-    end
-  end
-
-  def test_delete_all
-    testing_with do
-      @klass.delete_all
-    end
-  end
+  # def test_destroy_one
+  #   testing_with do
+  #     assert @first.destroy
+  #   end
+  # end
+  #
+  # def test_destroy_one_alone_via_class
+  #   testing_with do
+  #     assert @klass.destroy(@first.id)
+  #   end
+  # end
+  #
+  # def test_delete_one_alone
+  #   testing_with do
+  #     assert @klass.delete(@first.id)
+  #   end
+  # end
+  #
+  # def test_delete_many
+  #   testing_with do
+  #     to_delete = @klass.limit(2)
+  #     assert_equal 2, to_delete.length
+  #   end
+  # end
+  #
+  # def test_delete_all
+  #   testing_with do
+  #     @klass.delete_all
+  #   end
+  # end
 
   def test_clear_association
     department = Department.find([1,1])
@@ -71,6 +71,17 @@ class TestDelete < ActiveSupport::TestCase
     assert_equal 1, department.employees.size, "After delete and a reload from DB employee count should be 1."
   end
 
+  def test_has_many_replace
+    tariff = tariffs(:flat)
+    assert_equal(1, tariff.product_tariffs.length)
+
+    tariff.product_tariffs = [product_tariffs(:first_free), product_tariffs(:second_free)]
+    tariff.reload
+
+    assert_equal(2, tariff.product_tariffs.length)
+    refute(tariff.product_tariffs.include?(tariff))
+  end
+
   def test_destroy_has_one
     # In this case the association is a has_one with
     # dependent set to :destroy

data/test/test_predicates.rb

@@ -16,7 +16,26 @@ class TestPredicates < ActiveSupport::TestCase
 
     connection = ActiveRecord::Base.connection
     quoted = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
-    expected = "((#{quoted} = 0) OR (#{quoted} = 1) OR (#{quoted} = 2))"
+    expected = "(#{quoted} = 0 OR #{quoted} = 1 OR #{quoted} = 2)"
+
+    pred = cpk_or_predicate(predicates)
+    assert_equal(with_quoted_identifiers(expected), pred.to_sql)
+  end
+
+  def test_or_with_many_values
+    dep = Arel::Table.new(:departments)
+
+    predicates = Array.new
+
+    number_of_predicates = 3000 # This should really be big
+    number_of_predicates.times do |i|
+      predicates << dep[:id].eq(i)
+    end
+
+    connection = ActiveRecord::Base.connection
+    quoted = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
+    expected_ungrouped = ((0...number_of_predicates).map { |i| "#{quoted} = #{i}" }).join(' OR ')
+    expected = "(#{expected_ungrouped})"
 
     pred = cpk_or_predicate(predicates)
     assert_equal(with_quoted_identifiers(expected), pred.to_sql)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 9.0.1
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -279,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord