active_record_query_fixer 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95ad037bd6f75eeb6769488d667a077f6607414ff3c18e38b75dfe68ef783f3d
-  data.tar.gz: b1ad2dc43c9eb7fe1ccf671f5f184754329b964d66c1021f6bee2e7e25ae3507
+  metadata.gz: d5997cfbf763c93ff62479b46f02fa52c769723be216b7c2f60e57847e90a41e
+  data.tar.gz: d7fc6189ee2f6ad8c8af6244ab1f9e1e8ab8f67b9ba5142f3465460efcf589cd
 SHA512:
-  metadata.gz: 9312bb60d8dcc8c8d239e3dda2c6d6a5ef428751270bf86a19a99b0af8099ddd93c39444a93511f5e6aaf0daf499c2cd023b7632c5d3782349a276f6ac764a5f
-  data.tar.gz: bab25343f025ce024634c8403f7eccc08b4f966c7463658cbc72ba4ec44822ad2579715c8586ba4588e27fb78153c7938a548b4cbd7721f7c647dd679a34b830
+  metadata.gz: 942395bf5a468635a435503793793c80e914b2b37036033b0ab7fd9fc714a6c8e16d46be0167088ad9eaf4b308cc0c1274db45b4668ec2aa96e45808e55d4215
+  data.tar.gz: 155a52f9bcc3720b1bff57fae6ccafe5167b3ae9b515fedb5e257a109e702f2f5227a7813b743aad256389e45fd4d6e475ec08e8d32611def21cabecf396727d

data/lib/active_record_query_fixer.rb

@@ -3,14 +3,17 @@ require "dig_bang"
 class ActiveRecordQueryFixer
   autoload :RelationExtentions, "#{__dir__}/active_record_query_fixer/relation_extentions"
 
-  attr_reader :query
+  attr_reader :count_select, :query
+
+  delegate :connection, to: :query
+  delegate :quote_column_name, :quote_table_name, to: :connection
 
   def self.fix(query)
     new(query: query).fix.query
   end
 
-  def initialize(args)
-    @query = args.fetch(:query)
+  def initialize(query:)
+    @query = query
     @count_select = 0
   end
 
@@ -23,55 +26,57 @@ class ActiveRecordQueryFixer
     self
   end
 
-  def fix_select_group
+  def fix_select_group # rubocop:disable Metrics/AbcSize
     select_targets.each do |select_target|
-      fields = select_target.dig!("ResTarget", "val").dig("ColumnRef", "fields")
+      fields = select_target.res_target.val.column_ref.fields
       next if !fields || fields.length != 2
 
-      table = fields[0].dig("String", "str")
-      column = fields[1].dig("String", "str")
+      table = fields[0].string.str
+      column = fields[1].string&.str
 
       if column
         # A table and a column has been selected - make sure to group by that
-        @query = query.group("#{table}.#{column}")
-      elsif fields[1].key?("A_Star")
+        @query = query.group("#{quote_table_name(table)}.#{quote_column_name(column)}")
+      elsif fields[1].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("#{quote_table_name(table)}.#{quote_column_name("id")}")
       end
     end
 
     self
   end
 
-  def fix_order_group
+  def fix_order_group # rubocop:disable Metrics/AbcSize
     @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")
+      fields = sort_target.sort_by.node.column_ref&.fields
+
       next if !fields || fields.length != 2
 
-      table = fields.dig(0, "String", "str")
-      column = fields.dig(1, "String", "str")
+      table = fields[0].string.str
+      column = fields[1].string.str
 
-      @query = query.group("#{table}.#{column}") if table && column
+      @query = query.group("#{quote_table_name(table)}.#{quote_column_name(column)}") if table && column
     end
 
     self
   end
 
-  def fix_order_select_distinct
+  def fix_order_select_distinct # rubocop:disable Metrics/AbcSize
     select_appends = []
 
     sort_targets.each do |sort_target|
-      fields = sort_target.dig("SortBy", "node", "ColumnRef", "fields")
+      fields = sort_target.sort_by.node.column_ref.fields
       next if !fields || fields.length != 2
 
-      table = fields.dig(0, "String", "str")
-      column = fields.dig(1, "String", "str")
+      table = fields[0].string.str
+      column = fields[1].string.str
 
       next if !table || !column
 
-      select_appends << "#{table}.#{column} AS active_record_query_fixer_#{@count_select}"
+      select_appends << "#{quote_table_name(table)}.#{quote_column_name(column)} AS active_record_query_fixer_#{count_select}"
+
       @count_select += 1
     end
 
@@ -89,7 +94,7 @@ class ActiveRecordQueryFixer
     @query = query.group(query.model.arel_table[query.model.primary_key])
 
     query.values[:references].each do |reference|
-      @query = query.group("#{reference}.id")
+      @query = query.group("#{quote_table_name(reference)}.#{quote_column_name("id")}")
     end
 
     self
@@ -128,7 +133,7 @@ private
   end
 
   def select_table_wildcard_sql
-    @select_table_wildcard_sql ||= "#{query.table_name}.*"
+    @select_table_wildcard_sql ||= "#{quote_table_name(query.table_name)}.*"
   end
 
   def table_wildcard_prepended?
@@ -136,17 +141,15 @@ private
   end
 
   def select_statement
-    @select_statement ||= parsed_query.tree.dig!(0, "RawStmt", "stmt", "SelectStmt")
+    @select_statement ||= parsed_query.tree.stmts.fetch(0).stmt.select_stmt
   end
 
   def select_targets
-    @select_targets ||= select_statement.fetch("targetList")
+    @select_targets ||= select_statement.target_list
   end
 
   def sort_targets
-    return [] unless select_statement.key?("sortClause")
-
-    @sort_targets ||= parsed_query.tree.dig!(0, "RawStmt", "stmt", "SelectStmt", "sortClause")
+    @sort_targets ||= select_statement.sort_clause
   end
 end
 

data/lib/active_record_query_fixer/version.rb

@@ -1,3 +1,3 @@
 class ActiveRecordQueryFixer
-  VERSION = "0.0.13".freeze
+  VERSION = "0.0.14".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_query_fixer
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2021-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dig_bang