active_record_distinct_on 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '03806e7bb7b654ef57351d1b7123f4f07084e256eeb564a4d325b21e2f41bede'
-  data.tar.gz: 889c8a393d6c907bae4bb78afe291521e7fafd74f4b77f6190d07cbe39197acc
+  metadata.gz: 8429fb36902084f4300e9f4edc35399afa40ab14a54da89112803b85c1a6a945
+  data.tar.gz: 3ab332e86216c13e2d9989e5c94183d2c94d2c0d4af8118619180311e3e91369
 SHA512:
-  metadata.gz: 81b62213427b5a7bf5b18b63a508cd0cd454b6b6ae069817b28be2816c5c3df14698cd178589fbd7fcd693d74c3da664b7f867cf36c6ecffa3666bbc10b09ac5
-  data.tar.gz: d61728b40cd13d642a6cdb0e73a5e4a9287878d6fbc31ca849eb4c02874bbfd4d467fe4764e862c8ce9e2a8b899724012549fc928a3a62eeef1316ead07297f7
+  metadata.gz: 1fa6726a35706a2cfdc8e3aeafe5cb823d51cfe5281a59b0f84a5beebb2bca187e07cb2e257540234ffda58120bca3767030d4d54e2c00025ba1f9bbf4d56280
+  data.tar.gz: 98ac18e4bbbd862bb313d4cac040b1a2244c57400f934a22069712e95fadd49b1e4d599d114b54f49f22b743e27ab93929aa6dd6c6d2effbd45b5184e3b8cb61

data/lib/active_record_distinct_on/distinct_on_query_methods.rb

@@ -32,25 +32,53 @@ module ActiveRecordDistinctOn
       self
     end
 
+    def count(column_name = nil)
+      if distinct_on_values.empty?
+        super
+      else
+        if column_name && column_name != :all
+          raise ArgumentError,
+                "Cannot use column_name to .count for scopes that already specify `distinct_on` values"
+        end
+
+        # See https://github.com/rails/rails/pull/41622#issuecomment-1303078730
+        # We need to convert SQL that looks like "SELECT DISTINCT ON ( "dogs"."id" ) COUNT(*) FROM "dogs" ..."
+        # into SQL that looks like "SELECT COUNT(DISTINCT ( "dogs"."id" )) FROM "dogs" ...".
+        scope = spawn
+        scope.distinct_on_values = FROZEN_EMPTY_ARRAY
+
+        column_names = distinct_on_arel_columns.map do |col|
+          "\"#{col.relation.name}\".\"#{col.name}\""
+        end
+
+        scope.count("distinct #{column_names.join(', ')}")
+      end
+    end
+
     private
 
     def build_arel(*)
       super.tap do |arel|
-        build_distinct_on(arel, distinct_on_values)
+        build_distinct_on(arel)
       end
     end
 
-    def build_distinct_on(arel, columns)
-      return if columns.empty?
+    def build_distinct_on(arel)
+      return if distinct_on_values.empty?
 
-      arel_attributes = columns.map { |field|
+      arel.distinct_on(distinct_on_arel_columns)
+    end
+
+    def distinct_on_arel_columns
+      arel_attributes = distinct_on_values.map { |field|
         if klass.attribute_alias?(field)
           arel_table[klass.attribute_alias(field).to_sym]
         else
           arel_table[field]
         end
       }
-      arel.distinct_on(arel_columns arel_attributes)
+
+      arel_columns arel_attributes
     end
   end
 end

data/lib/active_record_distinct_on/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordDistinctOn
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_distinct_on
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Alec Larsen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-28 00:00:00.000000000 Z
+date: 2023-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -128,6 +128,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ActiveRecordDistinctOn adds support for `DISTINCT ON` to ActiveRecord.
   At the time of this writing, PostgreSQL is the only database which supports this
   syntax; however, this gem has been written with database independence in mind so
@@ -162,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.31
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Adds support for `DISTINCT ON` statements when querying with ActiveRecord