active_record_query_fixer 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 748952394d906b747d5be0d64efd08b2c45b37015f0d3ce928622b63770c1eb9
-  data.tar.gz: f9ac5f0a73434c61e06058fad5dbad01167238caba974876135e3f13514e594b
+  metadata.gz: 211d95cbf9d6f076875db25b572d387ccae0bab79966e5956b407fa585054114
+  data.tar.gz: 74dd84ce0e7573bd2a52864f02a2b0856d8c11caa45716946880476760a813d0
 SHA512:
-  metadata.gz: fe806b25d8a1176f108450ba2e0d86cd5ff3b7e4a612cee1415b054bb3ffd33661e068eb1b9ecc4ce18f38714d083afd0405e9d4910ddf55db34baa593730d59
-  data.tar.gz: 027b8b485cf08c9d62a2ddcbaa33acf05ae3338da4f24d5454cfa266ef8939f9f79a880f66069048807e9333f374f54f00de285ef7a8d28a1ddc8daf609cb136
+  metadata.gz: 497005381f08f135df4b672560b3a200ab9486252a8e1079d5e2f23fd11c6f22479296d9ff2eeada9f0b9d98b82a952ade57fa71f80c568cd43fcd0242a9f505
+  data.tar.gz: cc59eea2a2f6b2842d8d1583632780b91811171b69f50d3c0fe9fca8d7e78c80453bbc8dfd011c148f6527e2374aaa35729db7ce8c9e70887abfe4e9a36940ff

data/lib/active_record_query_fixer.rb

@@ -1,3 +1,6 @@
+require "dig_bang"
+require "pg_query"
+
 class ActiveRecordQueryFixer
   autoload :RelationExtentions, "#{__dir__}/active_record_query_fixer/relation_extentions"
 
@@ -16,18 +19,12 @@ class ActiveRecordQueryFixer
     fix_reference_group if fix_reference_group?
     fix_order_group if fix_order_group?
     fix_order_select_distinct if fix_order_select_distinct?
-    fix_distinct_group_select if @query.values[:distinct] && @query.values[:group] && @query.values[:select]
+    fix_select_group if @query.values[:select] && @query.values[:group]
 
     self
   end
 
-  def fix_distinct_group_select
-    require "dig_bang"
-    require "pg_query"
-
-    parsed_query = PgQuery.parse(@query.to_sql)
-    select_targets = parsed_query.tree.dig!(0, "RawStmt", "stmt", "SelectStmt", "targetList")
-
+  def fix_select_group
     select_targets.each do |select_target|
       fields = select_target.dig!("ResTarget", "val", "ColumnRef", "fields")
       next if fields.length != 2
@@ -50,8 +47,14 @@ class ActiveRecordQueryFixer
   def fix_order_group
     @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)) if group_by_order?(order)
+    sort_targets.each do |sort_target|
+      fields = sort_target.dig("SortBy", "node", "ColumnRef", "fields")
+      next if !fields || fields.length != 2
+
+      table = fields.dig(0, "String", "str")
+      column = fields.dig(1, "String", "str")
+
+      @query = @query.group("#{table}.#{column}") if table && column
     end
 
     self
@@ -59,8 +62,17 @@ class ActiveRecordQueryFixer
 
   def fix_order_select_distinct
     changed = false
-    @query.values[:order]&.each do |order|
-      @query = @query.select("#{extract_table_and_column_from_expression(order)} AS active_record_query_fixer_#{@count_select}")
+
+    sort_targets.each do |sort_target|
+      fields = sort_target.dig("SortBy", "node", "ColumnRef", "fields")
+      next if !fields || fields.length != 2
+
+      table = fields.dig(0, "String", "str")
+      column = fields.dig(1, "String", "str")
+
+      next if !table || !column
+
+      @query = @query.select("#{table}.#{column} AS active_record_query_fixer_#{@count_select}")
       changed = true
       @count_select += 1
     end
@@ -82,20 +94,6 @@ class ActiveRecordQueryFixer
 
 private
 
-  def extract_table_and_column_from_expression(order)
-    if order.is_a?(Arel::Nodes::Ascending) || order.is_a?(Arel::Nodes::Descending)
-      if order.expr.relation.respond_to?(:right)
-        "#{order.expr.relation.right}.#{order.expr.name}"
-      else
-        "#{order.expr.relation.table_name}.#{order.expr.name}"
-      end
-    elsif order.is_a?(String)
-      order
-    else
-      raise "Couldn't extract table and column from: #{order}"
-    end
-  end
-
   def fix_order_group?
     @query.values[:joins].blank? && @query.values[:distinct].present? ||
       @query.values[:group].present? && @query.values[:order].present?
@@ -109,8 +107,16 @@ private
     @query.values[:references].present? && @query.values[:group].present?
   end
 
-  def group_by_order?(order)
-    order.is_a?(String) && !order.match?(/\A\s*(COUNT|SUM)\(/i)
+  def parsed_query
+    @parsed_query ||= PgQuery.parse(@query.to_sql)
+  end
+
+  def select_targets
+    @select_targets ||= parsed_query.tree.dig!(0, "RawStmt", "stmt", "SelectStmt", "targetList")
+  end
+
+  def sort_targets
+    @sort_targets ||= parsed_query.tree.dig!(0, "RawStmt", "stmt", "SelectStmt", "sortClause")
   end
 end
 

data/lib/active_record_query_fixer/version.rb

@@ -1,3 +1,3 @@
 class ActiveRecordQueryFixer
-  VERSION = "0.0.8".freeze
+  VERSION = "0.0.9".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_query_fixer
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - kaspernj