active_record_query_fixer 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 857a123c7746b0ebd13d93156ced020958521e5c
-  data.tar.gz: 77645290416e092257151a2ecc2420f4e7405fa6
+  metadata.gz: 3bf2b49f0a63f435b0f58e0658e018a3d738728f
+  data.tar.gz: f8985015577b6c039a5fca1f6ca0a3f42bbf95a8
 SHA512:
-  metadata.gz: 2c362a8eda27b6c42bfeefef6af4a201800985823e7efaa08efecde260d2c08c7c1da55b41c46fcba7a05e25e7f2bcff1098a031fbc663ae47a5b91acae4f769
-  data.tar.gz: 1eb23a9207d260b706637e22b5ccbd9f47df50e8c4a48c5596204d163d27f9b63c78882a624aaa79b9629cdf4c72ecd8b6a07811e22bb76b19876f6fe24dcc33
+  metadata.gz: f55ef85d975ec9a09126a88f030a50ea8b1a9f2f61332db9e4eca55a3cbb69ffb22d5a3484ab9e9a5781a69d603e298e96c29d333fc69f2abe92cc32a7b57b5f
+  data.tar.gz: 27670b512d1c16e700145195d791cc81c90e8c9e66ef6e064523a39b49ce8f282a0cdc5e25c613b1c35fd5e4ea107b9a5febd394277d2334bd4d30a08a94c5cb

data/lib/active_record_query_fixer.rb

@@ -7,16 +7,16 @@ class ActiveRecordQueryFixer
 
   def initialize(args)
     @query = args.fetch(:query)
+    @count_select = 0
   end
 
   def fix
-    fix_order_group
-    fix_order_select_distinct
+    fix_order_group if fix_order_group?
+    fix_order_select_distinct if fix_order_select_distinct?
     self
   end
 
   def fix_order_group
-    return if @query.values[:joins].blank?
     @query = @query.group("#{@query.model.table_name}.#{@query.model.primary_key}")
 
     @query.values[:order].each do |order|
@@ -27,12 +27,11 @@ class ActiveRecordQueryFixer
   end
 
   def fix_order_select_distinct
-    return unless @query.values[:distinct]
-
     changed = false
     @query.values[:order].each do |order|
-      @query = @query.select(extract_table_and_column_from_expression(order))
+      @query = @query.select("#{extract_table_and_column_from_expression(order)} AS active_record_query_fixer_#{@count_select}")
       changed = true
+      @count_select += 1
     end
 
     @query = @query.select("#{@query.table_name}.*") if changed
@@ -54,4 +53,12 @@ private
       raise "Couldn't extract table and column from: #{order}"
     end
   end
+
+  def fix_order_group?
+    @query.values[:joins].blank? && @query.values[:distinct].present?
+  end
+
+  def fix_order_select_distinct?
+    @query.values[:distinct].present?
+  end
 end

data/lib/active_record_query_fixer/version.rb

@@ -1,3 +1,3 @@
 class ActiveRecordQueryFixer
-  VERSION = "0.0.1".freeze
+  VERSION = "0.0.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_query_fixer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-15 00:00:00.000000000 Z
+date: 2017-04-16 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.