active_record_query_fixer 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecd63505e1bd2832e3c0d25b29695a056ea45753244c9e0df443a921dbca9e95
-  data.tar.gz: 13393c3e1fffd4edfaedfcf720c2e4200e60761af8e9cd57471bc3d58965cba2
+  metadata.gz: e42bc2e925978449204db3564990728f9d82b66da3c977f74cadaf502095e1a8
+  data.tar.gz: 749e0f1224b32818616e91487cd93ec9ef0cd47ed3cb716be41f8748ac777289
 SHA512:
-  metadata.gz: 8cde6df550b51fba75fd4a65837d7a949727698c76824cefa34a6dd4054c822afe852462ed0e63125734b8230ce979f6b53190b05bd5237c04d4b09d87d40282
-  data.tar.gz: 51aacd618be7155fa7d8bd94bf78c9cbbc0671822b373baf730e926f74acde591b3b787684c49e9e3a07392799f518b52900147f3795dea9319cf5630ac93728
+  metadata.gz: 9bda979fc9bade5a2d07435866be6290eeeb20d876462de6a598e070c9d2ec636251b7bfc190a4491c5fdcd6a994a7e9a8e6362a38ba44458c0a3a7a895edb7f
+  data.tar.gz: 542b47e254a9001b151c534ce251df809d0be23867fd42f6146af6d1b1e5ae25db63a045a175a39420abd1bb2f36957d2cc160d1132066f0a4064aca05f436c2

data/lib/active_record_query_fixer.rb

@@ -19,25 +19,25 @@ 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_select_group if @query.values[:select] && @query.values[:group]
+    fix_select_group if query.values[:select] && query.values[:group]
 
     self
   end
 
   def fix_select_group
     select_targets.each do |select_target|
-      fields = select_target.dig!("ResTarget", "val", "ColumnRef", "fields")
-      next if fields.length != 2
+      fields = select_target.dig!("ResTarget", "val").dig("ColumnRef", "fields")
+      next if !fields || fields.length != 2
 
       table = fields[0].dig("String", "str")
       column = fields[1].dig("String", "str")
 
       if column
         # A table and a column has been selected - make sure to group by that
-        @query = @query.group("#{table}.#{column}")
+        @query = query.group("#{table}.#{column}")
       elsif fields[1].key?("A_Star")
         # A table and a star has been selected - assume the primary key is called "id" and group by that
-        @query = @query.group("#{table}.id")
+        @query = query.group("#{table}.id")
       end
     end
 
@@ -45,7 +45,7 @@ class ActiveRecordQueryFixer
   end
 
   def fix_order_group
-    @query = @query.group(@query.model.arel_table[@query.model.primary_key])
+    @query = query.group(query.model.arel_table[query.model.primary_key])
 
     sort_targets.each do |sort_target|
       fields = sort_target.dig("SortBy", "node", "ColumnRef", "fields")
@@ -54,15 +54,14 @@ class ActiveRecordQueryFixer
       table = fields.dig(0, "String", "str")
       column = fields.dig(1, "String", "str")
 
-      @query = @query.group("#{table}.#{column}") if table && column
+      @query = query.group("#{table}.#{column}") if table && column
     end
 
     self
   end
 
   def fix_order_select_distinct
-    changed = false
-    select_defined = @query.values[:select].present?
+    select_appends = []
 
     sort_targets.each do |sort_target|
       fields = sort_target.dig("SortBy", "node", "ColumnRef", "fields")
@@ -73,21 +72,25 @@ class ActiveRecordQueryFixer
 
       next if !table || !column
 
-      @query = @query.select("#{table}.#{column} AS active_record_query_fixer_#{@count_select}")
-      changed = true
+      select_appends << "#{table}.#{column} AS active_record_query_fixer_#{@count_select}"
       @count_select += 1
     end
 
-    @query = @query.select("#{@query.table_name}.*") if changed && !select_defined
+    # Start by prepending a wild-card select before doing the fix-selects to avoid any issues with `DISTINCT COUNT`
+    prepend_table_wildcard if !table_wildcard_prepended? && select_appends.any? && query.values[:select].blank?
+
+    select_appends.each do |select_append|
+      @query = query.select(select_append)
+    end
 
     self
   end
 
   def fix_reference_group
-    @query = @query.group(@query.model.arel_table[@query.model.primary_key])
+    @query = query.group(query.model.arel_table[query.model.primary_key])
 
-    @query.values[:references].each do |reference|
-      @query = @query.group("#{reference}.id")
+    query.values[:references].each do |reference|
+      @query = query.group("#{reference}.id")
     end
 
     self
@@ -96,20 +99,40 @@ class ActiveRecordQueryFixer
 private
 
   def fix_order_group?
-    @query.values[:joins].blank? && @query.values[:distinct].present? && @query.values[:order].present? ||
-      @query.values[:group].present? && @query.values[:order].present?
+    query.values[:joins].blank? && query.values[:distinct].present? && query.values[:order].present? ||
+      query.values[:group].present? && query.values[:order].present?
   end
 
   def fix_order_select_distinct?
-    @query.values[:distinct].present? && @query.values[:order].present?
+    query.values[:distinct].present? && query.values[:order].present?
   end
 
   def fix_reference_group?
-    @query.values[:references].present? && @query.values[:group].present?
+    query.values[:references].present? && query.values[:group].present?
   end
 
   def parsed_query
-    @parsed_query ||= PgQuery.parse(@query.to_sql)
+    @parsed_query ||= PgQuery.parse(query.to_sql)
+  end
+
+  # Prepends 'table_name.*' to the query. It needs to be pre-pended in case a `COUNT` or another aggregate function has been added to work with `DISTINCT`.
+  def prepend_table_wildcard
+    old_select = query.values[:select]&.clone || []
+    old_select = old_select.keep_if { |select_statement| select_statement != select_table_wildcard_sql }
+
+    @query = query.except(:select).select(select_table_wildcard_sql)
+
+    old_select.each do |select_statement|
+      @query = query.select(select_statement)
+    end
+  end
+
+  def select_table_wildcard_sql
+    @select_table_wildcard_sql ||= "#{query.table_name}.*"
+  end
+
+  def table_wildcard_prepended?
+    query.values[:select]&.first == select_table_wildcard_sql
   end
 
   def select_statement

data/lib/active_record_query_fixer/version.rb

@@ -1,3 +1,3 @@
 class ActiveRecordQueryFixer
-  VERSION = "0.0.11".freeze
+  VERSION = "0.0.12".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_query_fixer
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-19 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dig_bang