composite_primary_keys 11.0.0.beta2 → 11.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a08042363d370a0d0dfd0a9299fab51dd7eeb82d
-  data.tar.gz: 17ee927164d58a2f018cbab91d6019b19870ba6d
+SHA256:
+  metadata.gz: f06b556871f465285e08ae730e3a7b393a1a2342215083dec37e85ccb8e323f7
+  data.tar.gz: 2efcdf65030ce1463981c2e728988a35b4c5ed2f2e650c32aca2025b760cfc46
 SHA512:
-  metadata.gz: b59369b4e4da7602adbdd189849ff00fb6759c3f772d46668b613323fb69b0f8bd853318800622ea0d9757ef98dd68d21e0c5150b5f68c508f2bcc412e1b6a0a
-  data.tar.gz: ffeee036dfe8ee31a6cbd184feccf00109d4d871200d7f9568e74823f1e5acc57ac2069792e01e4a29a53eeb5c1c3d7c19d0bc94effb0e8510aebe19e65f3641
+  metadata.gz: 4774876569874db813bfbc549460c8e4ea4d67c35261e8be1b2844ba776604d0435a87875d05326212f76b4573a097cecc0c19dac0f86e3f501cf7d81b73db6b
+  data.tar.gz: b493eaae3998c02850addc163eab57e1548a8d4ec608cd8df6d1136d6b59b8fddbbb58410861a8777ed80f7d65a2d8c6db171b0247b29ceb4b21e5ddba543f5d

data/History.rdoc

@@ -1,3 +1,8 @@
+== 11.0.0.beta3 (2017-12-10)
+
+* Fix typo in Readme.doc (Lopez Lucien)
+* Fix Calculations#execute_simple_calculation for ActiveRecord 5.2.beta2 (Charlie Savage)
+
 == 11.0.0.beta2 (2017-12-10)
 
 * Minor updates for ActiveRecord 5.2.beta2 support (Charlie Savage)

data/README.rdoc

@@ -60,7 +60,7 @@ That is, associations can include composite keys too.  All Rails association typ
 == Usage
 
 Once you’ve created your models to specify composite primary keys (such as the Membership class)
-and associations (such as MembershipStatus#membership), you can uses them like any normal model
+and associations (such as MembershipStatus#membership), you can use them like any normal model
 with associations.
 
 But first, lets check out our primary keys.

data/lib/composite_primary_keys/relation/calculations.rb

@@ -18,8 +18,10 @@ module CompositePrimaryKeys
         column_alias = column_name
 
         # CPK
-        #if operation == "count" && has_limit_or_offset?
-        if operation == "count"
+        if self.composite? && 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
 

data/lib/composite_primary_keys/version.rb

@@ -3,6 +3,6 @@ module CompositePrimaryKeys
     MAJOR = 11
     MINOR = 0
     TINY  = 0
-    STRING = [MAJOR, MINOR, TINY, 'beta2'].join('.')
+    STRING = [MAJOR, MINOR, TINY, 'beta3'].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.beta2
+  version: 11.0.0.beta3
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-10 00:00:00.000000000 Z
+date: 2018-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord