active_record_distinct_on 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2bdc5ffaa6c0bd2aed0a69fdab6a454a0ca1d5010907a91a3083c47f86e9f5f
-  data.tar.gz: 4a14067373b241a5f9c816d6dca59edfcb73410aa88929e3d6c6bfc7f94a0d20
+  metadata.gz: 8429fb36902084f4300e9f4edc35399afa40ab14a54da89112803b85c1a6a945
+  data.tar.gz: 3ab332e86216c13e2d9989e5c94183d2c94d2c0d4af8118619180311e3e91369
 SHA512:
-  metadata.gz: beaca47b08017c4c728c9d1ddfe30f480e88c5ef12a8905b18e2e6d7791eaee3cd1fa64028ecf89831d57bfe121c45eae29ff398dbfba54ab835ef55ae0ed4dd
-  data.tar.gz: 3b43fad485e74d7c4e514475962e0280e5ee929a755ef74cc4bea013c5389ef7b6b1305ffdddd908058f7a92b635545a288d575af809bc74fd02bf481699f036
+  metadata.gz: 1fa6726a35706a2cfdc8e3aeafe5cb823d51cfe5281a59b0f84a5beebb2bca187e07cb2e257540234ffda58120bca3767030d4d54e2c00025ba1f9bbf4d56280
+  data.tar.gz: 98ac18e4bbbd862bb313d4cac040b1a2244c57400f934a22069712e95fadd49b1e4d599d114b54f49f22b743e27ab93929aa6dd6c6d2effbd45b5184e3b8cb61

data/lib/active_record_distinct_on/distinct_on_query_methods.rb

@@ -28,27 +28,57 @@ module ActiveRecordDistinctOn
 
     def distinct_on!(*fields)
       fields.flatten!
-      fields.map! { |field|
-        if klass.attribute_alias?(field)
-          arel_table[klass.attribute_alias(field).to_sym]
-        else
-          arel_table[field]
-        end
-      }
       self.distinct_on_values += fields
       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)
-      arel.distinct_on arel_columns columns unless columns.empty?
+    def build_distinct_on(arel)
+      return if distinct_on_values.empty?
+
+      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_columns arel_attributes
     end
   end
 end

data/lib/active_record_distinct_on/version.rb

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

data/lib/active_record_distinct_on.rb

@@ -8,6 +8,7 @@ module ActiveRecordDistinctOn
   def self.install
     ActiveRecord::Relation.include DistinctOnQueryMethods
     ActiveRecord::Querying.delegate :distinct_on, to: :all
+    ActiveRecord::Relation::Merger::NORMAL_VALUES << :distinct_on
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_distinct_on
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Alec Larsen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-10 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.1.6
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Adds support for `DISTINCT ON` statements when querying with ActiveRecord