active_record_distinct_on 1.1.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '096152ff6a14c3419f6d8196a9b8fcfd6fb493ad77db7171f3294b475d461415'
-  data.tar.gz: 375f1085f3eb6d7e1077fc2a0745a5d225b181118662a88f54640fd34d55c054
+  metadata.gz: '03806e7bb7b654ef57351d1b7123f4f07084e256eeb564a4d325b21e2f41bede'
+  data.tar.gz: 889c8a393d6c907bae4bb78afe291521e7fafd74f4b77f6190d07cbe39197acc
 SHA512:
-  metadata.gz: cfda3ac9d31b0062ae5fba155eedd12a55e0e0be0b440029d4c387c6d579fb10a2c10c0f35eef235bce842eef65bfe423a7e471a9194bb1d14f49e0d8aa8c541
-  data.tar.gz: f68fdb758e4d9e17b72e1ba3797075d3b13f81af7c5af3c253cf127756bee8fe9093c491e9ce9a923339202f5647b4a33ab2d13f1fc6dcea4ef1f4e98293240d
+  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_attribute(klass.attribute_alias(field).to_sym)
-        else
-          arel_attribute(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.1.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.1.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Alec Larsen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-01 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -76,16 +76,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +147,7 @@ homepage: https://github.com/alecdotninja/active_record_distinct_on
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -162,8 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.31
+signing_key:
 specification_version: 4
 summary: Adds support for `DISTINCT ON` statements when querying with ActiveRecord
 test_files: []