active_record_query_fixer 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7627a28c325bb89b5b7e0f5b1498c69b828167fd6077dcc5093138bc2e66d6f4
-  data.tar.gz: 94ea6b3827f3bfd4e986ac927ba48a804ca86d41e00321200568e170ad5355b3
+  metadata.gz: 19fa73e1ddacc9003ee2eb47d734a7352db57ba07cc3289058f59accb3f6c35f
+  data.tar.gz: dab480dc00323d18ea6e407514f0d5af914319eaed54a39e251d6198e8c25513
 SHA512:
-  metadata.gz: 34b513778527ea0b76d912a2d7e9786aa5f63e6a0af40d80325a79d441c8bebdacdf21712dce56ce5efc08f5e3e01d3b09d4fc1199abfb641f37be9a1f24ee0e
-  data.tar.gz: e4c1780d83ae0d4f5d3fd582c3979185d034dd584b3ec02b7d5ccb853cc51fe68dbd0c9c86a9fcd1a2104ffe8239233bba7b54f74e0c7ecdeb0a913f4bf897d1
+  metadata.gz: 71e5ca9135ba7667b3e7da108a9b2543116afa23e8ab1b50a0d0d1a37a291aba82859739c43d2cc1021d29a2466b60ce00633b7624c4a8c17265f97962aa66c9
+  data.tar.gz: af90fa1f50f0ef0edaa15e95543ec087a870ef0cef1ac79cfcac981eceb56f9a3c4492b3f3a58db7a01306b236f791642b9a3aff2ea554eed28252f52a29f6ac

data/lib/active_record_query_fixer.rb

@@ -13,13 +13,14 @@ class ActiveRecordQueryFixer
   end
 
   def fix
+    fix_reference_group if fix_reference_group?
     fix_order_group if fix_order_group?
     fix_order_select_distinct if fix_order_select_distinct?
     self
   end
 
   def fix_order_group
-    @query = @query.group("#{@query.model.table_name}.#{@query.model.primary_key}")
+    @query = @query.group(@query.model.arel_table[@query.model.primary_key])
 
     @query.values[:order]&.each do |order|
       @query = @query.group(extract_table_and_column_from_expression(order))
@@ -40,6 +41,14 @@ class ActiveRecordQueryFixer
     self
   end
 
+  def fix_reference_group
+    @query = @query.group(@query.model.arel_table[@query.model.primary_key])
+
+    @query.values[:references].each do |reference|
+      @query = @query.group("#{reference}.id")
+    end
+  end
+
 private
 
   def extract_table_and_column_from_expression(order)
@@ -64,6 +73,10 @@ private
   def fix_order_select_distinct?
     @query.values[:distinct].present? && @query.values[:order].present?
   end
+
+  def fix_reference_group?
+    @query.values[:references].present? && @query.values[:group].present?
+  end
 end
 
 ActiveRecord::Relation.include ActiveRecordQueryFixer::RelationExtentions

data/lib/active_record_query_fixer/version.rb

@@ -1,3 +1,3 @@
 class ActiveRecordQueryFixer
-  VERSION = "0.0.4".freeze
+  VERSION = "0.0.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_query_fixer
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies: []
 description: A library for automatically added `.select` on a column used for `.distinct`
   or automatically adding `.group` for a column used for order.
@@ -45,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A library for automatically added `.select` on a column used for `.distinct`