active_record_distinct_on 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2bdc5ffaa6c0bd2aed0a69fdab6a454a0ca1d5010907a91a3083c47f86e9f5f
-  data.tar.gz: 4a14067373b241a5f9c816d6dca59edfcb73410aa88929e3d6c6bfc7f94a0d20
+  metadata.gz: '03806e7bb7b654ef57351d1b7123f4f07084e256eeb564a4d325b21e2f41bede'
+  data.tar.gz: 889c8a393d6c907bae4bb78afe291521e7fafd74f4b77f6190d07cbe39197acc
 SHA512:
-  metadata.gz: beaca47b08017c4c728c9d1ddfe30f480e88c5ef12a8905b18e2e6d7791eaee3cd1fa64028ecf89831d57bfe121c45eae29ff398dbfba54ab835ef55ae0ed4dd
-  data.tar.gz: 3b43fad485e74d7c4e514475962e0280e5ee929a755ef74cc4bea013c5389ef7b6b1305ffdddd908058f7a92b635545a288d575af809bc74fd02bf481699f036
+  metadata.gz: 81b62213427b5a7bf5b18b63a508cd0cd454b6b6ae069817b28be2816c5c3df14698cd178589fbd7fcd693d74c3da664b7f867cf36c6ecffa3666bbc10b09ac5
+  data.tar.gz: d61728b40cd13d642a6cdb0e73a5e4a9287878d6fbc31ca849eb4c02874bbfd4d467fe4764e862c8ce9e2a8b899724012549fc928a3a62eeef1316ead07297f7

data/lib/active_record_distinct_on/distinct_on_query_methods.rb

@@ -28,13 +28,6 @@ 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
@@ -48,7 +41,16 @@ module ActiveRecordDistinctOn
     end
 
     def build_distinct_on(arel, columns)
-      arel.distinct_on arel_columns columns unless columns.empty?
+      return if columns.empty?
+
+      arel_attributes = columns.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)
     end
   end
 end

data/lib/active_record_distinct_on/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordDistinctOn
-  VERSION = '1.3.0'
+  VERSION = '1.4.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.4.0
 platform: ruby
 authors:
 - Alec Larsen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.31
 signing_key:
 specification_version: 4
 summary: Adds support for `DISTINCT ON` statements when querying with ActiveRecord