active_record_query_fixer 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 87c898d6d7d8bd5a191024b09c414d29496a34e2
-  data.tar.gz: 5a6405a8f8d1dfdb6a2a2de53081c90c8184f0a5
+SHA256:
+  metadata.gz: 7627a28c325bb89b5b7e0f5b1498c69b828167fd6077dcc5093138bc2e66d6f4
+  data.tar.gz: 94ea6b3827f3bfd4e986ac927ba48a804ca86d41e00321200568e170ad5355b3
 SHA512:
-  metadata.gz: 0cc9600b2a48b33ef00a0dc61956a5225ffbef4a029d68e3c66d30b2ac98c008cf059fb24408cc2dc9b0b80b68487a4e83c6b04d847a32fef5c64de06a533ac3
-  data.tar.gz: 28b261d8608b7645d3063a05f465d97d0e62206210c69883e9a335098b7d5af4f1d2d318e0a024eab8a02cab32c94912a98c004167ea1fabed4fc33b2e40ddfc
+  metadata.gz: 34b513778527ea0b76d912a2d7e9786aa5f63e6a0af40d80325a79d441c8bebdacdf21712dce56ce5efc08f5e3e01d3b09d4fc1199abfb641f37be9a1f24ee0e
+  data.tar.gz: e4c1780d83ae0d4f5d3fd582c3979185d034dd584b3ec02b7d5ccb853cc51fe68dbd0c9c86a9fcd1a2104ffe8239233bba7b54f74e0c7ecdeb0a913f4bf897d1

data/lib/active_record_query_fixer.rb

@@ -21,7 +21,7 @@ class ActiveRecordQueryFixer
   def fix_order_group
     @query = @query.group("#{@query.model.table_name}.#{@query.model.primary_key}")
 
-    @query&.values[:order]&.each do |order|
+    @query.values[:order]&.each do |order|
       @query = @query.group(extract_table_and_column_from_expression(order))
     end
 
@@ -30,7 +30,7 @@ class ActiveRecordQueryFixer
 
   def fix_order_select_distinct
     changed = false
-    @query&.values[:order]&.each do |order|
+    @query.values[:order]&.each do |order|
       @query = @query.select("#{extract_table_and_column_from_expression(order)} AS active_record_query_fixer_#{@count_select}")
       changed = true
       @count_select += 1
@@ -57,11 +57,12 @@ private
   end
 
   def fix_order_group?
-    @query&.values[:joins]&.blank? && @query&.values[:distinct]&.present?
+    @query.values[:joins].blank? && @query.values[:distinct].present? ||
+      @query.values[:group].present? && @query.values[:order].present?
   end
 
   def fix_order_select_distinct?
-    @query&.values[:distinct]&.present?
+    @query.values[:distinct].present? && @query.values[:order].present?
   end
 end
 

data/lib/active_record_query_fixer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_query_fixer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-03 00:00:00.000000000 Z
+date: 2018-06-05 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.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A library for automatically added `.select` on a column used for `.distinct`