composite_primary_keys 11.0.0 → 11.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09c1654a22421c134dada5504263aa6bcb99f358a47e96476917027f1d692818'
-  data.tar.gz: 31ce78f246ace36159863eb16215311b3ad5dd8c70a10825ae9413b6062770b7
+  metadata.gz: 0ffea425aed78412bab66e908f3873e7838b80afc2731a36d93c3a2ddc7edf7e
+  data.tar.gz: 83b24a29fa3178dd065c2f07e92ef308d99b4cfc70d69d236633e1ca5c5d62d1
 SHA512:
-  metadata.gz: 4a1bb8d41dad76559c1034e7f9957bf2c3583fb8ab6a67856f05f3e34a1f535463332ce7fac0b922c0ebeaa4f82f59ffea188c6306eebb9535614ecee3a2123b
-  data.tar.gz: e924ffffedde42aa9220213fd3b0cb1253d6aff7c6fd4d84a5240356133ffaf89ba0d777e72294fb97bbc90cc1f4f8f6756420bba879fbe1f3cec9e4babd9220
+  metadata.gz: d654cf0a62880f798255090f1acad0f4c05cf13ceeeb0544b3643560bd4da5a0c69380077605a54835d3bda4a0e612b03045cf0199973f2190c75be98f4cf14e
+  data.tar.gz: 27d2527c66f6a5b1db40e69af9f8bc4718a0eedb628e992e5c38b5dbc9ed6fdd961d79fb5b07204724bf6eaf33e2dfc85663078ad52114071a63a9820d6e04be

data/History.rdoc

@@ -1,3 +1,7 @@
+== 11.0.1 (2018-06-20)
+* Fix in_batches (Urmo Rae)
+* Fix apply_join_dependency (Charlie Savage)
+
 == 11.0.0 (2018-06-18)
 * Update to ActiveRecord 5.2 (Charlie Savage)
 * Fixes for AR 5.2 persistence changes (Erik Rothoff, Charlie Savage)
@@ -30,6 +34,9 @@
 
 * ActiveRecord 5.2.beta2 support (Charlie Savage)
 
+== 10.0.5 (?)
+* Fix in_batches (Urmo Rae)
+
 == 10.0.4 (2018-06-17)
 
 * Lock mysql2 gem to 0.4.x (Le Trung Kien)

data/lib/composite_primary_keys/connection_adapters/abstract_mysql_adapter.rb

@@ -2,27 +2,20 @@ module ActiveRecord
   module ConnectionAdapters
     class AbstractMysqlAdapter
       def subquery_for(key, select)
-        subselect = select.clone
-        subselect.projections = [key]
+        subsubselect = select.clone
+        subsubselect.projections = [key]
 
         # Materialize subquery by adding distinct
         # to work with MySQL 5.7.6 which sets optimizer_switch='derived_merge=on'
-        subselect.distinct unless select.limit || select.offset || select.orders.any?
+        subsubselect.distinct unless select.limit || select.offset || select.orders.any?
 
-        # CPK
-        if key.is_a?(Array)
-          key_names = key.map(&:name).map {|key_name| Arel.sql(key_name)}
-          Arel::SelectManager.new(subselect.as("__active_record_temp")).project(key_names)
-        else
-          key_name = quote_column_name(key.name)
-          Arel::SelectManager.new(subselect.as("__active_record_temp")).project(Arel.sql(key_name))
-        end
+        subselect = Arel::SelectManager.new(select.engine)
 
         # CPK
         #subselect.project Arel.sql(key.name)
-#        subselect.project Arel.sql(Array(key).map(&:name).join(', '))
+        subselect.project Arel.sql(Array(key).map(&:name).join(', '))
 
- #       subselect.from subsubselect.as('__active_record_temp')
+        subselect.from subsubselect.as('__active_record_temp')
       end
     end
   end

data/lib/composite_primary_keys/relation/finder_methods.rb

@@ -1,19 +1,27 @@
 module CompositePrimaryKeys
   module ActiveRecord
     module FinderMethods
-      def apply_join_dependency(join_dependency = construct_join_dependency)
+      def apply_join_dependency(eager_loading: true)
+        join_dependency = construct_join_dependency
         relation = except(:includes, :eager_load, :preload).joins!(join_dependency)
 
-        if using_limitable_reflections?(join_dependency.reflections)
-          relation
-        else
-          if relation.limit_value
+        if eager_loading && !using_limitable_reflections?(join_dependency.reflections)
+          if has_limit_or_offset?
             limited_ids = limited_ids_for(relation)
+
             # CPK
             # limited_ids.empty? ? relation.none! : relation.where!(primary_key => limited_ids)
             limited_ids.empty? ? relation.none! : relation.where!(cpk_in_predicate(table, self.primary_keys, limited_ids))
+
           end
-          relation.except(:limit, :offset)
+          relation.limit_value = relation.offset_value = nil
+        end
+
+        if block_given?
+          relation._select!(join_dependency.aliases.columns)
+          yield relation, join_dependency
+        else
+          relation
         end
       end
 

data/lib/composite_primary_keys/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 11.0.0
+  version: 11.0.1
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2018-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord