composite_primary_keys 8.1.3 → 8.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dcd8c948f14181d3e5ebb97a5a79f124e7e9cef
-  data.tar.gz: 435b1a7ffaf2c481b09b268fd28585112a092f44
+  metadata.gz: 8ca795714eef0beaa1a0e91a07b09b1735b12242
+  data.tar.gz: 41e87e3f7ae758e975809e56d8c7a3396d604f4c
 SHA512:
-  metadata.gz: c38c11665ea24815069cd8c2c14701108cc1516663cba835eb044db3ebcabc26d46dee9db88d9c2c6923d992ee3c0b8293825ca3f2af88411641a1ed0a4bff67
-  data.tar.gz: cd22418296a7ffbd27c5ece78c7bc835be47bd50b4a4ed51c96bea564225fa3ebc9782fb60ba6b02a76d7784074c56c2df82d7d3e443cd7e17053ab8a25b43f9
+  metadata.gz: 1f142511ba73692d9599bafdf78b26e61405a76b34b4de455f313a248fec5b6a75240f56eb9f6ef87ec299edd9db3ac5fc2b7849e51ed84b1efb16e852fa62c5
+  data.tar.gz: ebf3f4281ee1c7c372a8b035a2e7a2a8651f7972a673c38555de38449b05d781696971eb7f507f912322c4527a28664216d4f8c69cfaafb5d11f09a71c8aea20

data/History.rdoc

@@ -1,3 +1,8 @@
+== 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/base.rb

@@ -53,6 +53,70 @@ module ActiveRecord
       def composite?
         false
       end
+
+      def find_in_batches(options = {})
+        return super unless primary_key.is_a?(Array)
+
+        # Unfortunately .count uses a subquery temp table, which is a big problem when your table is large
+        number_of_rows = count(primary_key.first)
+        batch_size = options[:batch_size] || 100000
+        row_number = 0
+
+        while row_number < number_of_rows
+          end_row_number = row_number + batch_size - 1
+          end_row_number = number_of_rows - 1 if end_row_number > number_of_rows - 1
+
+          # Force the necessary sorting; AR as is will sort a PK table incorrectly
+          start_key = order(*primary_key).
+                         offset(row_number).
+                             first.
+                                 attributes.
+                                     slice(*primary_key)
+
+          end_key =   order(*(primary_key.map { |k| "#{k} ASC" })).
+                         offset(end_row_number).
+                             first.
+                                 attributes.
+                                     slice(*primary_key)
+
+          relation = self
+          lower_bounds = []
+          upper_bounds = []
+
+          # Iterate through the PKs positionally; when we have found a discrepancy between start and end
+          # then we know that's where the boundaries are
+          primary_key.each do |col|
+             if start_key[col] == end_key[col]
+                              relation = relation.where("#{col} = '#{start_key[col]}'")
+                            else
+                                             lower_bounds << [col, start_key[col]]
+                                             upper_bounds << [col, end_key[col]]
+                                           end
+           end
+
+          relation = relation.where(build_batch_case(lower_bounds, '>')) unless lower_bounds.empty?
+          relation = relation.where(build_batch_case(upper_bounds, '<')) unless upper_bounds.empty?
+
+          yield(relation.order(*primary_key))
+
+          row_number = end_row_number + 1
+        end
+      end
+
+      private
+
+      def build_batch_case(bounds, operator)
+        bounds = bounds.dup
+        bound = bounds.shift
+        if bounds.empty?
+          "#{bound[0]} #{operator}= '#{bound[1]}' "
+          else
+          sql_case = "CASE WHEN #{bound[0]} = '#{bound[1]}' THEN "
+          sql_case += build_batch_case(bounds, operator)
+          sql_case += "ELSE #{bound[0]} #{operator} '#{bound[1]}' END "
+          sql_case
+        end
+      end
     end
 
     def composite?

data/lib/composite_primary_keys/composite_predicates.rb

@@ -8,17 +8,22 @@ module CompositePrimaryKeys
       end
     end
 
-    def cpk_or_predicate(predicates)
+    def cpk_or_predicate(predicates, group = true)
       if predicates.length <= 1
         predicates.first
       else
-        predicates_copy = predicates.dup
-        predicate = predicates_copy.shift
+        split_point = predicates.length / 2
+        predicates_first_half = predicates[0...split_point]
+        predicates_second_half = predicates[split_point..-1]
 
-        or_predicate = predicates_copy.inject(predicate) do |mem, predicate|
-          ::Arel::Nodes::Or.new(mem, predicate)
+        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
-        ::Arel::Nodes::Grouping.new(or_predicate)
       end
     end
 
@@ -53,4 +58,4 @@ ActiveRecord::Associations::JoinDependency::JoinAssociation.send(:include, Compo
 ActiveRecord::Associations::Preloader::Association.send(:include, CompositePrimaryKeys::Predicates)
 ActiveRecord::Associations::HasManyThroughAssociation.send(:include, CompositePrimaryKeys::Predicates)
 ActiveRecord::Relation.send(:include, CompositePrimaryKeys::Predicates)
-ActiveRecord::PredicateBuilder.send(:extend, CompositePrimaryKeys::Predicates)
+ActiveRecord::PredicateBuilder.send(:extend, CompositePrimaryKeys::Predicates)

data/lib/composite_primary_keys/version.rb

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

data/test/fixtures/reference_type.rb

@@ -1,12 +1,12 @@
-class ReferenceType < ActiveRecord::Base
-  self.primary_key = :reference_type_id
-  has_many :reference_codes, :foreign_key => "reference_type_id", :dependent => :destroy
-  accepts_nested_attributes_for :reference_codes
-
-  validates_presence_of :type_label, :abbreviation
-  validates_uniqueness_of :type_label
-
-  before_destroy do |record|
-    a = record
-  end
-end
+class ReferenceType < ActiveRecord::Base
+  self.primary_key = :reference_type_id
+  has_many :reference_codes, :foreign_key => "reference_type_id", :dependent => :destroy
+  accepts_nested_attributes_for :reference_codes
+
+  validates_presence_of :type_label, :abbreviation
+  validates_uniqueness_of :type_label
+
+  before_destroy do |record|
+    a = record
+  end
+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]
+	has_many :products, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
+end

data/test/test_find_in_batches.rb

@@ -0,0 +1,30 @@
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestFindInBatches < ActiveSupport::TestCase
+  fixtures :capitols
+
+  def test_in_batches
+    capitols = []
+    Capitol.find_in_batches do |chunk|
+      capitols += chunk.map(&:country)
+    end
+    assert_equal(capitols, ['Canada', 'France', 'Mexico', 'The Netherlands'])
+  end
+
+  def test_in_small_batches
+    capitols = []
+    Capitol.find_in_batches(batch_size: 2) do |chunk|
+        capitols += chunk.map(&:country)
+      end
+
+    assert_equal(capitols, ['Canada', 'France', 'Mexico', 'The Netherlands'])
+  end
+
+  def test_in_one_unit_batch
+    capitols = []
+    Capitol.find_in_batches(batch_size: 1) do |chunk|
+        capitols += chunk.map(&:country)
+      end
+    assert_equal(capitols, ['Canada', 'France', 'Mexico', 'The Netherlands'])
+  end
+end

data/test/test_predicates.rb

@@ -22,6 +22,25 @@ class TestEqual < ActiveSupport::TestCase
     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 = 30000 # 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)
+  end
+
   # def test_and
   #   dep = Arel::Table.new(:departments)
   #
@@ -38,4 +57,4 @@ class TestEqual < ActiveSupport::TestCase
   #   pred = cpk_and_predicate(predicates)
   #   assert_equal(with_quoted_identifiers(expected), pred.to_sql)
   # end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 8.1.3
+  version: 8.1.4
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-16 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.20
+        version: 0.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.20
+        version: 0.4.4
 description: Composite key support for ActiveRecord
 email: 
 executables: []
@@ -233,6 +233,7 @@ files:
 - test/test_equal.rb
 - test/test_exists.rb
 - test/test_find.rb
+- test/test_find_in_batches.rb
 - test/test_habtm.rb
 - test/test_ids.rb
 - test/test_miscellaneous.rb
@@ -268,7 +269,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
@@ -294,6 +295,7 @@ test_files:
 - test/test_equal.rb
 - test/test_exists.rb
 - test/test_find.rb
+- test/test_find_in_batches.rb
 - test/test_habtm.rb
 - test/test_ids.rb
 - test/test_miscellaneous.rb