composite_primary_keys 11.0.0.beta3 → 11.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f06b556871f465285e08ae730e3a7b393a1a2342215083dec37e85ccb8e323f7
-  data.tar.gz: 2efcdf65030ce1463981c2e728988a35b4c5ed2f2e650c32aca2025b760cfc46
+  metadata.gz: a82bde494ba8ade055be42d3e57d7d6f4eb31aebe5417e5e7c92590963943cab
+  data.tar.gz: 28805dfbc66e70f35452d852a7f2a5f20248ec64a6798d844505c6a2aec7fc73
 SHA512:
-  metadata.gz: 4774876569874db813bfbc549460c8e4ea4d67c35261e8be1b2844ba776604d0435a87875d05326212f76b4573a097cecc0c19dac0f86e3f501cf7d81b73db6b
-  data.tar.gz: b493eaae3998c02850addc163eab57e1548a8d4ec608cd8df6d1136d6b59b8fddbbb58410861a8777ed80f7d65a2d8c6db171b0247b29ceb4b21e5ddba543f5d
+  metadata.gz: 2e67fdc2a3846cc17ed323ffcbdc3d4eb2c2da3c898436f667ac071a3f6f1abc25983f77dd68798055a6a9365556d36c8631798f9bfed71cafe1a6ab3156e001
+  data.tar.gz: facd88fcfacbc76cf14d0ca0c6f9c9ecce5d5ef39856f32eb40ed20d91e9e8b48bc40829bbcf2013c95249f689a0c32e189aba054cd580a2ec74b6075fc71908

data/History.rdoc

@@ -1,4 +1,8 @@
-== 11.0.0.beta3 (2017-12-10)
+== 11.0.0.beta4 (2018-01-08)
+
+* Try again on Calculations#execute_simple_calculation for ActiveRecord 5.2.beta2 (Charlie Savage)
+
+== 11.0.0.beta3 (2018-01-07)
 
 * Fix typo in Readme.doc (Lopez Lucien)
 * Fix Calculations#execute_simple_calculation for ActiveRecord 5.2.beta2 (Charlie Savage)

data/lib/composite_primary_keys/relation/calculations.rb

@@ -18,14 +18,14 @@ module CompositePrimaryKeys
         column_alias = column_name
 
         # CPK
-        if self.composite? && operation == "count"
+        # if operation == "count" && has_limit_or_offset?
+        #   # Shortcut when limit is zero.
+        #   return 0 if limit_value == 0
+        #
+        #   query_builder = build_count_subquery(spawn, column_name, distinct)
+        if operation == "count"
           relation = unscope(:order)
           query_builder = build_count_subquery(relation, column_name, distinct)
-        elsif operation == "count" && has_limit_or_offset?
-          # Shortcut when limit is zero.
-          return 0 if limit_value == 0
-
-          query_builder = build_count_subquery(spawn, column_name, distinct)
         else
           # PostgreSQL doesn't like ORDER BY when there are no GROUP BY
           relation = unscope(:order).distinct!(false)

data/lib/composite_primary_keys/version.rb

@@ -3,6 +3,6 @@ module CompositePrimaryKeys
     MAJOR = 11
     MINOR = 0
     TINY  = 0
-    STRING = [MAJOR, MINOR, TINY, 'beta3'].join('.')
+    STRING = [MAJOR, MINOR, TINY, 'beta4'].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.beta3
+  version: 11.0.0.beta4
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-07 00:00:00.000000000 Z
+date: 2018-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord